Adjustments for build on CentOS.

MapServer · Apr 20, 2012 · 6e60a7e · 6e60a7e
1 parent 6e02a5f
commit 6e60a7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -447,7 +447,7 @@ php_mapscript_clean:
 	cd mapscript/php; $(MAKE) clean;
 
 php_mapscript_install:
-	cd mapscript/php; $(MAKE) install;
+	cd mapscript/php; $(MAKE) install DESTDIR=$(DESTDIR);
 
 python_mapscript: $(LIBMAP)
 	cd mapscript/python; $(MAKE);
@@ -456,7 +456,7 @@ python_mapscript_clean:
 	cd mapscript/python; $(MAKE) clean;
 
 python_mapscript_install:
-	cd mapscript/python; $(MAKE) install;
+	cd mapscript/python; $(MAKE) install DESTDIR=$(DESTDIR);
 
 install: install-lib install-bin install-cgibin @MAKE_PHP_MAPSCRIPT_INSTALL@ @MAKE_PYTHON_MAPSCRIPT_INSTALL@
 

diff --git a/mapscript/python/Makefile.in b/mapscript/python/Makefile.in
@@ -23,8 +23,8 @@ LTINSTALL=$(LIBTOOL) --mode=install
 XTRALIBS= @XTRALIBS@
 
 
-PYLIBDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
-PYINCDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_inc; print get_python_inc()"`
+PYLIBDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"`
+PYINCDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)"`
 
 RUNPATH= -rpath $(PYLIBDIR)
 DEFINES=@ALL_ENABLED@
@@ -51,8 +51,8 @@ mapscript_wrap.c: ../mapscript.i
 	$(SWIG) -python -shadow -modern -templatereduce -fastdispatch -fvirtual -fastproxy -modernargs -castmode -dirvtable -fastinit -fastquery -noproxydel -nobuildnone $(DEFINES) -o mapscript_wrap.c ../mapscript.i
 
 install: _mapscript.la
-	$(LTINSTALL) $(INSTALL) _mapscript.la $(PYLIBDIR)
-	$(INSTALL) -c mapscript.py $(PYLIBDIR)
+	$(LTINSTALL) $(INSTALL) _mapscript.la $(DESTDIR)$(PYLIBDIR)
+	$(INSTALL) -c mapscript.py $(DESTDIR)$(PYLIBDIR)
 
 clean:
 	-rm -rf .libs *.lo *.la *.so *.o pygdioctx/*.o pygdioctx/*.lo mapscript_wrap.c mapscript.py