[cpp-sp COMMIT] in /branches/REL_2: configs/Makefile.am configs/apache.config.in configs/apache2.config.in configs/ap...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 25 01:22:50 2011
New Revision: 3505

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3505&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-345

Modified:
    branches/REL_2/configs/Makefile.am
    branches/REL_2/configs/apache.config.in
    branches/REL_2/configs/apache2.config.in
    branches/REL_2/configs/apache22.config.in
    branches/REL_2/doc/Makefile.am
    branches/REL_2/shibboleth.spec.in

Modified: branches/REL_2/configs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/Makefile.am?rev=3505&r1=3504&r2=3505&view=diff
==============================================================================
--- branches/REL_2/configs/Makefile.am (original)
+++ branches/REL_2/configs/Makefile.am Thu Aug 25 01:22:50 2011
@@ -4,9 +4,9 @@
 
 pkglibdir = ${libdir}/@PACKAGE@
 pkglogdir = ${localstatedir}/log/@PACKAGE@
-pkgdocdir = $(datadir)/doc/@PACKAGE at -@PACKAGE_VERSION@
 shirelogdir = ${localstatedir}/log/httpd
 pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgwebdir = $(datadir)/@PACKAGE@
 pkgrundir = $(localstatedir)/run/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
@@ -46,7 +46,7 @@
 	metadataError.html \
 	bindingTemplate.html \
 	discoveryTemplate.html \
-    postTemplate.html \
+	postTemplate.html \
 	localLogout.html \
 	globalLogout.html \
 	partialLogout.html \
@@ -61,8 +61,8 @@
         -e 's:@-PREFIX-@:${prefix}:g' \
         -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
         -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-        -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
         -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+        -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
         -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
         -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
         -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
@@ -100,7 +100,6 @@
 
 install-data-local:	all-data-local
 	$(mkinstalldirs) $(DESTDIR)$(pkglogdir)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
 	$(mkinstalldirs) $(DESTDIR)$(shirelogdir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)

Modified: branches/REL_2/configs/apache.config.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/apache.config.in?rev=3505&r1=3504&r2=3505&view=diff
==============================================================================
--- branches/REL_2/configs/apache.config.in (original)
+++ branches/REL_2/configs/apache.config.in Thu Aug 25 01:22:50 2011
@@ -1,4 +1,4 @@
-# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
 # RPM installations on platforms with a conf.d directory will
 # result in this file being copied into that directory for you
@@ -32,8 +32,8 @@
 # Used for example logo and style sheet in error templates.
 #
 <IfModule mod_alias.c>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #

Modified: branches/REL_2/configs/apache2.config.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/apache2.config.in?rev=3505&r1=3504&r2=3505&view=diff
==============================================================================
--- branches/REL_2/configs/apache2.config.in (original)
+++ branches/REL_2/configs/apache2.config.in Thu Aug 25 01:22:50 2011
@@ -1,4 +1,4 @@
-# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
 # RPM installations on platforms with a conf.d directory will
 # result in this file being copied into that directory for you
@@ -19,8 +19,8 @@
   <Location /shibboleth-sp>
     Allow from all
   </Location>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #

Modified: branches/REL_2/configs/apache22.config.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/apache22.config.in?rev=3505&r1=3504&r2=3505&view=diff
==============================================================================
--- branches/REL_2/configs/apache22.config.in (original)
+++ branches/REL_2/configs/apache22.config.in Thu Aug 25 01:22:50 2011
@@ -1,4 +1,4 @@
-# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
 # RPM installations on platforms with a conf.d directory will
 # result in this file being copied into that directory for you
@@ -19,8 +19,8 @@
   <Location /shibboleth-sp>
     Allow from all
   </Location>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #


[... 56 lines stripped ...]