moved apache header dir to the toplevel makefile

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

diff --git a/src/Makefile b/src/Makefile
index ffcf195..ce532e2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,21 +3,22 @@
 #
 
 # Change to suit...
-export PREFIX          = /pines
-export APXS                    = /pines/apps/apache2/bin/apxs
-export TMP                     = /tmp/opensrf_build
-
-
-export TMPDIR          = $(TMP)/opensrf
-export OPENSRF         = opensrf
-export BINDIR          = $(PREFIX)/bin
-export LIBDIR          = $(PREFIX)/lib
-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 /usr/include/libxml2/libxml  -I $(TMP) -I $(TMPDIR)
+export PREFIX                          = /pines
+export APXS                                    = /pines/apps/apache2/bin/apxs
+export TMP                                     = /tmp/opensrf_build
+export APACHE_HEADERS  = /pines/apps/apache2/include 
+
+
+export TMPDIR                  = $(TMP)/opensrf
+export OPENSRF                 = opensrf
+export BINDIR                  = $(PREFIX)/bin
+export LIBDIR                  = $(PREFIX)/lib
+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) \
+                                                               -I/usr/include/libxml2/libxml  -I$(TMP) -I$(TMPDIR)
 
 
 all: prep router srfsh jserver gateway

diff --git a/src/gateway/Makefile b/src/gateway/Makefile
index b688938..1a2ccf3 100644 (file)
--- a/src/gateway/Makefile
+++ b/src/gateway/Makefile
@@ -1,4 +1,4 @@
-CC_OPTS        += -I /pines/apps/apache2/include -DASSUME_STATELESS
+CC_OPTS        += -DASSUME_STATELESS
 LD_OPTS        += -lc_utils -lobjson -lxml2 -lopensrf_transport -lopensrf_stack -ljson 
 
 all: libmod_ils_gateway.so