lib/lib64 for mod_gridsite.so too

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index b99a600..5ecbfa7 100644 (file)
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,6 @@
+* Thu Jul 02 2009 Andrew McNab <Andrew.McNab@cern.ch>
+- Use lib/lib64 for mod_gridsite.so location in 
+  Makefile and make-gridsite-spec
 * Wed Jul 01 2009 Andrew McNab <Andrew.McNab@cern.ch>
 - ==== GridSite version 1.7.3 ====
 * Wed Jul 01 2009 Andrew McNab <Andrew.McNab@cern.ch>

diff --git a/org.gridsite.core/doc/httpd-fileserver.conf b/org.gridsite.core/doc/httpd-fileserver.conf
index 8ced99c..5d701fb 100644 (file)
--- a/org.gridsite.core/doc/httpd-fileserver.conf
+++ b/org.gridsite.core/doc/httpd-fileserver.conf
@@ -82,6 +82,7 @@ KeepAlive             On
 MaxKeepAliveRequests   100
 KeepAliveTimeout       300
 
+# (Replace /lib/ with /lib64/ if on x86_64!)
 LoadModule log_config_module   /usr/lib/httpd/modules/mod_log_config.so
 LoadModule ssl_module          /usr/lib/httpd/modules/mod_ssl.so
 LoadModule gridsite_module     /usr/lib/httpd/modules/mod_gridsite.so

diff --git a/org.gridsite.core/doc/httpd-storage.conf b/org.gridsite.core/doc/httpd-storage.conf
index e5923bf..eeba72f 100644 (file)
--- a/org.gridsite.core/doc/httpd-storage.conf
+++ b/org.gridsite.core/doc/httpd-storage.conf
@@ -84,6 +84,7 @@ KeepAlive             On
 MaxKeepAliveRequests   100
 KeepAliveTimeout       300
 
+# (Replace /lib/ with /lib64/ if on x86_64!)
 LoadModule log_config_module   /usr/lib/httpd/modules/mod_log_config.so
 LoadModule ssl_module          /usr/lib/httpd/modules/mod_ssl.so
 LoadModule gridsite_module     /usr/lib/httpd/modules/mod_gridsite.so

diff --git a/org.gridsite.core/doc/httpd-webserver.conf b/org.gridsite.core/doc/httpd-webserver.conf
index 61b3a0e..0e019e0 100644 (file)
--- a/org.gridsite.core/doc/httpd-webserver.conf
+++ b/org.gridsite.core/doc/httpd-webserver.conf
@@ -92,6 +92,7 @@ KeepAlive             On
 MaxKeepAliveRequests   100
 KeepAliveTimeout       15
 
+# (Replace /lib/ with /lib64/ if on x86_64!)
 LoadModule log_config_module   /usr/lib/httpd/modules/mod_log_config.so
 LoadModule ssl_module          /usr/lib/httpd/modules/mod_ssl.so
 LoadModule gridsite_module     /usr/lib/httpd/modules/mod_gridsite.so

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 1227959..8d702bd 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -391,7 +391,7 @@ install: apidoc install-lib
                  $(prefix)/sbin \
                  $(prefix)/share/man/man1 \
                  $(prefix)/share/man/man8 \
-                 $(prefix)/lib/httpd/modules \
+                 $(prefix)/$(libdir)/httpd/modules \
                  $(prefix)/share/doc/gridsite-$(MINOR_VERSION)
        echo '#define' GRST_VERSION $(DEFVERSION) > $(prefix)/include/gridsite.h
        cat ../interface/gridsite.h >>$(prefix)/include/gridsite.h
@@ -426,7 +426,7 @@ install: apidoc install-lib
        ln -sf htcp $(prefix)/bin/htping
        ln -sf htcp $(prefix)/bin/htfind
        cp -f gsexec $(prefix)/sbin
-       cp -f mod_gridsite.so $(prefix)/lib/httpd/modules
+       cp -f mod_gridsite.so $(prefix)/($libdir)/httpd/modules
 
 install-lib:
        mkdir -p $(prefix)/$(libdir)

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index 8145dc0..7a950c3 100755 (executable)
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -203,7 +203,7 @@ fi
 
 %files apache
 %attr(-, root, root) %{prefix}/share/man/man8/mod_gridsite.8.gz
-%attr(-, root, root) %{prefix}/lib/httpd/modules/mod_gridsite.so
+%attr(-, root, root) %{prefix}/%{_lib}/httpd/modules/mod_gridsite.so
 %attr(-, root, root) %{prefix}/sbin/real-gridsite-admin.cgi
 %attr(-, root, root) %{prefix}/sbin/gridsite-copy.cgi
 %attr(-, root, root) %{prefix}/sbin/gridsite-storage.cgi