[OpenSRF-GIT] OpenSRF branch rel_2_5 updated. osrf_rel_2_5_0-3-gdab6877

[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, rel_2_5 has been updated
       via  dab68778d6064b3ff5688ea3c622b38f07b4f993 (commit)
      from  f9344c8d7792bfe233881756ebe4f41896f93916 (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 dab68778d6064b3ff5688ea3c622b38f07b4f993
Author: Graham Billiau <graham at geeksinthegong.net>
Date:   Mon Jul 31 11:00:25 2017 -0400

    LP#1704090: ensure make install respects DESTDIR
    
    This patch ensures that 'make install' uses DESTDIR consistently,
    making life easier for packagers.
    
    Signed-off-by: Graham Billiau <graham at geeksinthegong.net>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f75238..a86281f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,10 +68,10 @@ install-exec-hook:
 			rm "$(DESTDIR)@sysconfdir@/$${f}.bak" ; \
 		done; \
 	fi
-	if [ ! -e @bindir@/osrf_control ]; then \
-		ln -s @bindir@/opensrf-perl.pl @bindir@/osrf_control; \
+	if [ ! -e "$(DESTDIR)@bindir@/osrf_control" ]; then \
+		ln -s "opensrf-perl.pl" "$(DESTDIR)@bindir@/osrf_control"; \
 	fi
 
 uninstall-hook:
-	rm -f @includedir@/opensrf/apachetools.h
+	rm -f "$(DESTDIR)@includedir@/opensrf/apachetools.h"
 
diff --git a/src/gateway/Makefile.am b/src/gateway/Makefile.am
index 54da170..d4f327d 100644
--- a/src/gateway/Makefile.am
+++ b/src/gateway/Makefile.am
@@ -35,8 +35,13 @@ install-exec-local:
 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
 	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_websocket_translator.c apachetools.c apachetools.h libopensrf.so
 	$(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
+	if [ "$(DESTDIR)" ]; then \
+		$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_json_gateway.la; \
+		$(APXS2) -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_http_translator.la; \
+	else \
+		$(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; \
+	fi
 	$(APXS2) -n osrf_websocket_translator -i -S LIBEXECDIR=$(DESTDIR)$(AP_LIBEXECDIR) @srcdir@/osrf_websocket_translator.la
 
 clean-local:

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

Summary of changes:
 src/Makefile.am         |    6 +++---
 src/gateway/Makefile.am |    9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
OpenSRF