[Opensrf-commits] r1915 - trunk/src/gateway (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-02-02 12:11:29 -0500 (Tue, 02 Feb 2010)
New Revision: 1915

Modified:
   trunk/src/gateway/Makefile.am
Log:
Forward-port r1908 + r1914 from rel_1_2 to improve portability without breaking


Modified: trunk/src/gateway/Makefile.am
===================================================================
--- trunk/src/gateway/Makefile.am	2010-02-02 17:08:55 UTC (rev 1914)
+++ trunk/src/gateway/Makefile.am	2010-02-02 17:11:29 UTC (rev 1915)
@@ -20,9 +20,10 @@
 DISTCLEANFILES = Makefile.in Makefile
 
 install-exec-local: 
-	if [ ! "$$(grep mod_placeholder `$(APXS2) -q SYSCONFDIR`/httpd.conf)" ]; \
+	d=`$(APXS2) -q SYSCONFDIR` && \
+		if ! grep mod_placeholder $${d}/httpd.conf 2>&1 >/dev/null ; \
 		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-		>> `$(APXS2) -q SYSCONFDIR`/httpd.conf; \
+		>> $${d}/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