From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Sun, 19 Jun 2005 18:08:56 +0000 (+0000)
Subject: renamed some more apache makefile vars
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2390c9aabb9ba993522cda7a1e3ea2a09b12abf9;p=working%2FOpenSRF.git

renamed some more apache makefile vars


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

diff --git a/src/Makefile b/src/Makefile
index ce532e2..d42f957 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,9 +4,9 @@
 
 # Change to suit...
 export PREFIX				= /pines
-export APXS					= /pines/apps/apache2/bin/apxs
+export APXS2					= /pines/apps/apache2/bin/apxs
 export TMP					= /tmp/opensrf_build
-export APACHE_HEADERS	= /pines/apps/apache2/include 
+export APACHE2_HEADERS	= /pines/apps/apache2/include 
 
 
 export TMPDIR			= $(TMP)/opensrf
@@ -17,7 +17,7 @@ export PERLDIR			= $(LIBDIR)/perl5
 export INCLUDEDIR		= $(PREFIX)/include
 export CC				= gcc
 export LD_OPTS			= -L $(TMPDIR) -L .
-export CC_OPTS			= -Wall -O2 -fPIC -I/usr/include/libxml2 -I$(APACHE_HEADERS) \
+export CC_OPTS			= -Wall -O2 -fPIC -I/usr/include/libxml2 -I$(APACHE2_HEADERS) \
 								-I/usr/include/libxml2/libxml  -I$(TMP) -I$(TMPDIR)
 
 
diff --git a/src/gateway/Makefile b/src/gateway/Makefile
index 1a2ccf3..75d7279 100644
--- a/src/gateway/Makefile
+++ b/src/gateway/Makefile
@@ -5,7 +5,7 @@ all: libmod_ils_gateway.so
 
 install: 
 	cp $(TMPDIR)/libmod_ils_gateway.so $(LIBDIR)/libmod_ils_gateway.so
-	$(APXS) -i -a -n ils_gateway $(LIBDIR)/libmod_ils_gateway.so
+	$(APXS2) -i -a -n ils_gateway $(LIBDIR)/libmod_ils_gateway.so
 
 libmod_ils_gateway.so: mod_ils_gateway.c	
 	$(CC) -c $(CC_OPTS)  mod_ils_gateway.c