Fix doc references.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2500 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 612d60d..cbb949f 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -3,6 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 pkglogdir = ${localstatedir}/log/@PACKAGE@
+pkgdocdir = ${datadir}/doc/@PACKAGE@
 shirelogdir = ${localstatedir}/log/httpd
 xmldir = $(datadir)/xml
 pkgxmldir = $(datadir)/xml/@PACKAGE@
@@ -49,14 +50,15 @@ CONFIGFILES = \
 do-build-file:
        rm -f ${FILE}.tmp
        sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
-           -e 's:@-PREFIX-@:${prefix}:g' \
-           -e 's:@-LIBEXECDIR-@:${libexecdir}:g' \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
-            -e 's:@-XMLDIR-@:${xmldir}:g' \
-           -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
-           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-           -e 's:@-VARRUNDIR-@:${varrundir}:g'
+        -e 's:@-PREFIX-@:${prefix}:g' \
+        -e 's:@-LIBEXECDIR-@:${libexecdir}:g' \
+        -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+        -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+        -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
+        -e 's:@-XMLDIR-@:${xmldir}:g' \
+        -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
+        -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
+        -e 's:@-VARRUNDIR-@:${varrundir}:g'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -100,10 +102,10 @@ all-data-local: $(BUILTCONFIGFILES)
 
 install-data-local:    all-data-local
        $(mkinstalldirs) $(DESTDIR)$(pkglogdir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
        $(mkinstalldirs) $(DESTDIR)$(shirelogdir)
        $(mkinstalldirs) $(DESTDIR)$(varrundir)
        $(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
-       $(mkinstalldirs) $(DESTDIR)$(prefix)/data
        $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
        for f in $(BUILTCONFIGFILES); do \
                if test ! -f $(DESTDIR)${pkgsysconfdir}/$$f; then \

diff --git a/configs/apache.config.in b/configs/apache.config.in
index 8a4ab26..bfe69ef 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 e79d481..c9ff93b 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -24,8 +24,8 @@ ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.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 65a1865..b913f88 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -24,8 +24,8 @@ ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.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/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs
index f2b40cf..3c07957 100644 (file)
--- a/msi/scripts/shib_edit_config_files.vbs
+++ b/msi/scripts/shib_edit_config_files.vbs
@@ -129,9 +129,9 @@ if (Err = 0) then
   ConfigFile = DistDir & "apache.config.in"
   ReplaceInFile ConfigFile, "@-XMLDIR-@", ConvertedDir & "/share/xml"
   ReplaceInFile ConfigFile, "catalog.xml:", "catalog.xml;"
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
   ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
   ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
-  ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache.config")) then
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache.config", false
   End If
@@ -143,9 +143,9 @@ if (Err = 0) then
   ConfigFile = DistDir & "apache2.config.in"
   ReplaceInFile ConfigFile, "@-XMLDIR-@", ConvertedDir & "/share/xml"
   ReplaceInFile ConfigFile, "catalog.xml:", "catalog.xml;"
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
   ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
   ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
-  ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache2.config")) then
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache2.config", false
   End If
@@ -157,9 +157,9 @@ if (Err = 0) then
   ConfigFile = DistDir & "apache22.config.in"
   ReplaceInFile ConfigFile, "@-XMLDIR-@", ConvertedDir & "/share/xml"
   ReplaceInFile ConfigFile, "catalog.xml:", "catalog.xml;"
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
   ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
   ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
-  ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache22.config")) then
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache22.config", false
   End If