lib/lib64 for mod_gridsite.so too

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index 911c797..0a8bf02 100644 (file)
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,5 +1,9 @@
-* Fri Jun 27 2008 Andrew McNab <Andrew.McNab@cern.ch>
-- ==== GridSite version 1.5.10 ====
+* Fri Jul  3 2009 Andrew McNab <Andrew.McNab@cern.ch>
+- New version for various fixes imported from 1.7.3
+- Use lib/lib64 for mod_gridsite.so in Makefile and 
+  make-gridsite-spec
+* Fri Jul  3 2009 Andrew McNab <Andrew.McNab@cern.ch>
+- ==== GridSite version 1.5.11 ====
 * Mon Jun 23 2008 Andrew McNab <Andrew.McNab@man.ac.uk>
 - Backport changes from 1.7.x for Apache 2.2 and 
   Debian/SL5. 

diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION
index 3a207ce..ffe4fb7 100644 (file)
--- a/org.gridsite.core/VERSION
+++ b/org.gridsite.core/VERSION
@@ -1,5 +1,5 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1.5
-PATCH_VERSION=1.5.10
-DEFVERSION=010510
+PATCH_VERSION=1.5.11
+DEFVERSION=010511
 VERSION=$(PATCH_VERSION)

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 5a095ef..5f0f16b 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -347,7 +347,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
@@ -382,7 +382,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 c01c83a..7df772e 100755 (executable)
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -198,7 +198,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