Fix doc references.

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 8e6cd26..721d94c 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign
 pkglogdir = ${localstatedir}/log/@PACKAGE@
 shirelogdir = ${localstatedir}/log/httpd
 pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgdocdir = $(datadir)/doc/@PACKAGE@
 varrundir = $(localstatedir)/run
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
@@ -48,6 +49,7 @@ do-build-file:
            -e 's:@-LIBEXECDIR-@:${libexecdir}:' \
            -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
            -e 's:@-PKGXMLDIR-@:${pkgxmldir}:' \
+           -e 's:@-PKGDOCDIR-@:${pkgdocdir}:' \
            -e 's:@-PKGLOGDIR-@:${pkglogdir}:' \
            -e 's:@-SHIRELOGDIR-@:${shirelogdir}:' \
            -e 's:@-VARRUNDIR-@:${varrundir}:'

diff --git a/configs/apache.config.in b/configs/apache.config.in
index 14f80f9..fef3728 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -37,8 +37,8 @@ SetHandler shib-handler
 # Used for example logo and style sheet in error templates.
 #
 <IfModule mod_alias.c>
-  Alias /shibboleth-sp/main.css @-PREFIX-@/doc/shibboleth/main.css
-  Alias /shibboleth-sp/logo.jpg @-PREFIX-@/doc/shibboleth/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
 </IfModule>
 
 #

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 4a85514..5d691e5 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -24,8 +24,8 @@ ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
   <Location /shibboleth-sp>
     Allow from all
   </Location>
-  Alias /shibboleth-sp/main.css @-PREFIX-@/doc/shibboleth/main.css
-  Alias /shibboleth-sp/logo.jpg @-PREFIX-@/doc/shibboleth/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
 </IfModule>
 
 #

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index c7fe6ee..20ec2ca 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -24,8 +24,8 @@ ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
   <Location /shibboleth-sp>
     Allow from all
   </Location>
-  Alias /shibboleth-sp/main.css @-PREFIX-@/doc/shibboleth/main.css
-  Alias /shibboleth-sp/logo.jpg @-PREFIX-@/doc/shibboleth/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
 </IfModule>
 
 #