[OpenSRF-GIT] OpenSRF branch master updated. b2d3c5a55617aa4fa21fa6a98d381ceca1489447

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  b2d3c5a55617aa4fa21fa6a98d381ceca1489447 (commit)
      from  91b8790cc785036b2d48a10df3d8b8c2632f1f23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b2d3c5a55617aa4fa21fa6a98d381ceca1489447
Author: Ben Webb <bjwebb67 at googlemail.com>
Date:   Mon Jun 13 13:29:36 2011 +0100

    Respect DESTDIR during the build process
    
    Replace instances of make with the generic $(MAKE)
    Add $(DESTDIR) to paths it is currently missing from
    Manually specify the apxs2 install location so that DESTDIR can be prepended
    Attempt to create the apache directory if it does not exist
    
    Signed-off-by: Ben Webb <bjwebb67 at googlemail.com>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Makefile.am b/Makefile.am
index 048b766..7b137aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,10 +118,10 @@ endif
 SUBDIRS = src tests
 
 jserver:
-	make -s -C src jserver
+	$(MAKE) -s -C src jserver
 
 jserver-install:
-	make -s -C src jserver-install
+	$(MAKE) -s -C src jserver-install
 
 distclean-local:
 	rm -rf ./autom4te.cache
diff --git a/src/Makefile.am b/src/Makefile.am
index 18fe85c..74227f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,11 +57,11 @@ endif
 SUBDIRS = $(MAYBE_CORE) $(MAYBE_PY) $(MAYBE_JA)
 
 install-exec-local:
-	$(MKDIR_P) $(VAR)
-	$(MKDIR_P) $(PID)
-	$(MKDIR_P) $(LOG)
-	$(MKDIR_P) $(SOCK)
-	$(MKDIR_P) $(jsdir)
+	$(MKDIR_P) $(DESTDIR)$(VAR)
+	$(MKDIR_P) $(DESTDIR)$(PID)
+	$(MKDIR_P) $(DESTDIR)$(LOG)
+	$(MKDIR_P) $(DESTDIR)$(SOCK)
+	$(MKDIR_P) $(DESTDIR)$(jsdir)
 
 install-exec-hook:
 	if [ "$(MAYBE_CORE)" ]; then \
@@ -72,7 +72,7 @@ install-exec-hook:
 			rm "$(DESTDIR)@sysconfdir@/$${f}.bak" ; \
 		done; \
 	fi
-	cp -r @srcdir@/javascript/* $(jsdir)/
+	cp -r @srcdir@/javascript/* $(DESTDIR)$(jsdir)/
 
 uninstall-hook:
 	rm -f @includedir@/opensrf/apachetools.h
diff --git a/src/gateway/Makefile.am b/src/gateway/Makefile.am
index 0eb5706..3dafbdc 100644
--- a/src/gateway/Makefile.am
+++ b/src/gateway/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST = @srcdir@/apachetools.c @srcdir@/apachetools.h @srcdir@/osrf_json_ga
 
 AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I at abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
 AM_LDFLAGS = -L$(LIBDIR) -L at top_builddir@/src/libopensrf
+AP_LIBEXECDIR = `$(APXS2) -q LIBEXECDIR`
 
 DISTCLEANFILES = Makefile.in Makefile
 
@@ -27,8 +28,9 @@ install-exec-local:
 	fi
 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
-	$(APXS2) -i -a @srcdir@/osrf_json_gateway.la
-	$(APXS2) -i -a @srcdir@/osrf_http_translator.la
+	$(MKDIR_P) $(DESTDIR)$(AP_LIBEXECDIR)
+	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_json_gateway.la
+	$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) -a @srcdir@/osrf_http_translator.la
 
 clean-local:
 	rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 0d27bfa..4f49264 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -24,7 +24,7 @@ install: build-perl
 	./Build install
 
 build-perl:
-	perl Build.PL || make -s build-perl-fail
+	perl Build.PL --destdir $(DESTDIR) || make -s build-perl-fail
 
 build-perl-fail:
 	echo

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am             |    4 ++--
 src/Makefile.am         |   12 ++++++------
 src/gateway/Makefile.am |    6 ++++--
 src/perl/Makefile.am    |    2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
OpenSRF