Different location of mod_gridsite on Debian, modification of apache config examples.

diff --git a/org.gridsite.core/project/debian.rules b/org.gridsite.core/project/debian.rules
index 1f52400..8ecc773 100644 (file)
--- a/org.gridsite.core/project/debian.rules
+++ b/org.gridsite.core/project/debian.rules
@@ -4,7 +4,7 @@ override_dh_auto_build:
        \$(MAKE) -C src prefix=/usr build gridsite-delegation.cgi htproxyput slashgrid
 
 override_dh_auto_install:
-       \$(MAKE) -C src prefix=../debian/tmp/usr RPM_BUILD_ROOT=../debian/tmp install install-ws install-slashgrid
+       \$(MAKE) -C src prefix=../debian/tmp/usr httpd_name=apache2 RPM_BUILD_ROOT=../debian/tmp install install-ws install-slashgrid post-install-debian
 
 %:
        dh -Smakefile -Dsrc \$@

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 594d2c7..1287997 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -48,6 +48,10 @@ ifndef libdir
 export libdir=lib
 endif
 
+ifndef httpd_name
+export httpd_name=httpd
+endif
+
 CURL_CFLAGS=`curl-config --cflags`
 CURL_LIBS=`curl-config --libs`
 XML2_CFLAGS=`xml2-config --cflags`
@@ -399,12 +403,11 @@ clean:
 
 install: apidoc install-lib
        mkdir -p $(prefix)/include \
-                 $(prefix)/$(libdir) \
+                 $(prefix)/$(libdir)/$(httpd_name)/modules \
                  $(prefix)/bin \
                  $(prefix)/sbin \
                  $(prefix)/share/man/man1 \
                  $(prefix)/share/man/man8 \
-                 $(prefix)/$(libdir)/httpd/modules \
                  $(prefix)/share/doc/gridsite-$(MINOR_VERSION)
        sed 's/^\(#define GRST_VERSION\).*$$/\1 $(DEFVERSION)/' \
              ../interface/gridsite.h > $(prefix)/include/gridsite.h
@@ -439,7 +442,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)/$(libdir)/httpd/modules
+       cp -f mod_gridsite.so $(prefix)/$(libdir)/$(httpd_name)/modules
 
 install-lib:
        mkdir -p $(prefix)/$(libdir)
@@ -506,7 +509,13 @@ install-ws: gridsite-delegation.cgi htproxyput
        ln -sf htproxyput $(prefix)/bin/htproxyrenew
        ln -sf htproxyput $(prefix)/bin/htproxyinfo
        cp -f gridsite-delegation.cgi $(prefix)/sbin
-          
+
+post-install-debian:
+       sed -i \
+               -e 's,^\(ServerRoot\) .*,\1 "/etc/$(httpd_name)",' \
+               -e 's,/usr/lib/httpd/modules,/usr/$(libdir)/$(httpd_name)/modules,' \
+               $(prefix)/share/doc/gridsite-$(MINOR_VERSION)/*.conf
+
 #
 # Distributions
 #
@@ -602,4 +611,4 @@ wtf:
 #      ls -lR /usr/local/
 #      ls -lR $(GSOAPDIR)
 
-.PHONY: build build-lib apidoc clean install install-lib install-slashgrid install-ws dist htcp-bin rpm deb wtf
+.PHONY: build build-lib apidoc clean install install-lib install-slashgrid install-ws dist htcp-bin rpm deb wtf post-install-debian

diff --git a/org.gridsite.core/src/make-debian-files b/org.gridsite.core/src/make-debian-files
index 6ec93c1..df63340 100644 (file)
--- a/org.gridsite.core/src/make-debian-files
+++ b/org.gridsite.core/src/make-debian-files
@@ -32,7 +32,7 @@ echo "3.0 (quilt)" > source/format
 
 # apache
 cat > gridsite-apache.install <<EOF
-usr/lib/httpd/modules/mod_gridsite.so
+usr/lib/apache2/modules/mod_gridsite.so
 usr/sbin/real-gridsite-admin.cgi
 usr/sbin/gridsite-copy.cgi
 usr/sbin/gridsite-storage.cgi
@@ -41,7 +41,7 @@ cat > gridsite-apache.manpages <<EOF
 doc/mod_gridsite.8
 EOF
 cat > gridsite-apache.docs <<EOF
-doc/httpd-*.conf
+debian/tmp/usr/share/doc/gridsite-${MINOR_VERSION}/httpd-*.conf
 src/mod_gridsite_example.c
 EOF