Give Apache modules the support they need to work

Push the apxs compile stage into the local install steps as it seems to require root privileges to write during build

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1378 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/gateway/Makefile.am b/src/gateway/Makefile.am
index 569ba7d..f345a00 100644 (file)
--- a/src/gateway/Makefile.am
+++ b/src/gateway/Makefile.am
@@ -14,13 +14,12 @@
 
 EXTRA_DIST = @srcdir@/apachetools.c @srcdir@/apachetools.h @srcdir@/osrf_json_gateway.c @srcdir@/osrf_http_translator.c
 
-options=-D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) -L$(LIBDIR) -L@top_builddir@/src/libopensrf
-
-all-local:
-       $(APXS2) -c $(DEF_LDLIBS) $(options) @srcdir@/osrf_json_gateway.c
-       $(APXS2) -c $(DEF_LDLIBS) $(options) @srcdir@/osrf_http_translator.c
+AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
+AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
 
 install-exec-local: 
+       $(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