changed $ to $$ for shell vars

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1812 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 0564e29..e66de5e 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -4,6 +4,8 @@ export LDFLAGS                  = -L $(TMPDIR) -L .
 export CFLAGS                  = -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \
                                                                -I$(LIBXML2_HEADERS)/libxml  -I$(TMP) -I$(TMPDIR)
 
+export INCLUDEDIR += "/openils/"
+
 all: mod_xmltools mod_ils_rest_gateway
 
 
@@ -21,6 +23,7 @@ mod_ils_rest_gateway:
 
 mod_ils_rest_gateway-install:
        @echo $@
+       make -C apachemods libfieldmapper-install
        make -C apachemods mod_ils_rest_gateway-install
 
 mod_xmltools:
@@ -34,8 +37,8 @@ mod_xmltools-install:
 webcore-install:
        @echo $@
        echo "Copying web into $(WEBDIR)"
-       mkdir -p $(WEBDIR)
-       cp -r ../web/* $(WEBDIR)
+       #mkdir -p $(WEBDIR)
+       #cp -r ../web/* $(WEBDIR)
 
 autojs-install:
        @echo $@
@@ -69,7 +72,7 @@ cgi-bootstrap:
        @echo "Installing cgi's to $(CGIDIR)"
        mkdir -p $(TMP)/cgi-bin
        mkdir -p $(CGIDIR)
-       for i in cgi-bin/*cgi; do perl -pe "s{##CONFIG##}{$(ETCDIR)}" < $i > $(TMP)/$i; done
+       for i in cgi-bin/*cgi; do perl -pe "s{##CONFIG##}{$(ETCDIR)}" < $$i > $(TMP)/$$i; done
        cp $(TMP)/cgi-bin/*cgi $(CGIDIR)
        cp -r cgi-bin/support $(CGIDIR)
        cp cgi-bin/setup.pl $(ETCDIR)