[Opensrf-commits] r1859 - branches/rel_1_2/src/gateway (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-11-20 10:45:49 -0500 (Fri, 20 Nov 2009)
New Revision: 1859

Modified:
   branches/rel_1_2/src/gateway/Makefile.am
Log:
Patch from Jeroen van Meeuwen (Fedora Project) <kanarip at fedoraproject.org> to use $(APXS2)

Attached patch makes the auto foo respect the --with-apxs ./configure option for src/gateway/Makefile.am.


Modified: branches/rel_1_2/src/gateway/Makefile.am
===================================================================
--- branches/rel_1_2/src/gateway/Makefile.am	2009-11-20 15:41:18 UTC (rev 1858)
+++ branches/rel_1_2/src/gateway/Makefile.am	2009-11-20 15:45:49 UTC (rev 1859)
@@ -18,9 +18,9 @@
 AM_LDFLAGS = -L$(LIBDIR) -L at top_builddir@/src/libopensrf
 
 install-exec-local: 
-	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
+	if [ ! "$$(grep mod_placeholder `$(APXS2) -q SYSCONFDIR`/httpd.conf)" ]; \
 		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
+		>> `$(APXS2) -q SYSCONFDIR`/httpd.conf; \
 	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