Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f75238..a86281f 100644 (file)
--- 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 (file)
--- 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: