Sync

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 78572ff..1d2d5eb 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -488,11 +488,14 @@ htcp-bin: htcp
        rm -Rf ../htcp-bin-$(PATCH_VERSION)
 
 # RPM targets: build and RPMs go into subdirectories of ../RPMTMP/
+RELEASE_VERSION ?= 1
+MYRPMPREFIX ?= /usr
+
 rpm: dist
        export PATCH_VERSION=$(PATCH_VERSION) ; \
         export RELEASE_VERSION=$(RELEASE_VERSION) ; \
         export MINOR_VERSION=$(MINOR_VERSION) ; \
-        export MYPREFIX=/usr ; \
+        export MYRPMPREFIX=$(MYRPMPREFIX) ; \
         ./make-gridsite-spec
        rm -Rf $(MYRPMDIR)/BUILDROOT $(MYRPMDIR)/BUILD
        mkdir -p $(MYRPMDIR)/SOURCES $(MYRPMDIR)/SPECS $(MYRPMDIR)/BUILD \

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index c01c83a..fb378dd 100755 (executable)
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -36,7 +36,7 @@ Summary: GridSite
 License: Modified BSD
 Group: System Environment/Daemons
 Source: %{name}-%{version}.src.tar.gz
-Prefix: ${MYPREFIX:-/usr}
+Prefix: ${MYRPMPREFIX:-/usr}
 URL: http://www.gridsite.org/
 Vendor: GridPP
 Requires: libxml2
@@ -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