Sync gridsite-core_R_1_5_10_5
authorAndrew McNab <andrew.mcnab@manchester.ac.uk>
Mon, 12 Apr 2010 18:28:31 +0000 (18:28 +0000)
committerAndrew McNab <andrew.mcnab@manchester.ac.uk>
Mon, 12 Apr 2010 18:28:31 +0000 (18:28 +0000)
org.gridsite.core/src/Makefile

index 1d2d5eb..de41f9b 100644 (file)
@@ -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)