Added DESTDIR to Makefiles to assist in RPM building.

git-svn-id: http://svn.osgeo.org/postgis/trunk@434 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/Makefile b/Makefile
index da282bc3d85c73fd3566967bd1239a10333d1451..68ea9e8d95979e16468f2a2486d5acbe4fd32323 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -160,12 +160,11 @@ postgis_undef.sql: postgis.sql create_undef.pl
        perl create_undef.pl $< $(USE_VERSION) > $@ 
 
 install: all installdirs install-postgis-lib
-       $(INSTALL_DATA) $(srcdir)/README.postgis  $(docdir)/contrib
-       $(INSTALL_DATA) postgis.sql $(datadir)/contrib
-       $(INSTALL_DATA) postgis_undef.sql $(datadir)/contrib
-       $(INSTALL_DATA) spatial_ref_sys.sql $(datadir)/contrib
-       $(INSTALL_DATA) README.postgis $(datadir)/contrib
-       $(MAKE) -C loader install
+       $(INSTALL_DATA) postgis.sql $(DESTDIR)$(datadir)/contrib
+       $(INSTALL_DATA) postgis_undef.sql $(DESTDIR)$(datadir)/contrib
+       $(INSTALL_DATA) spatial_ref_sys.sql $(DESTDIR)$(datadir)/contrib
+       $(INSTALL_DATA) README.postgis $(DESTDIR)$(datadir)/contrib
+       $(MAKE) -C DESTDIR=$(DESTDIR) loader install
 
 #- This has been copied from postgresql and adapted
 install-postgis-lib: $(shlib)

diff --git a/loader/Makefile b/loader/Makefile
index 52ad65c5e1b884300630b78150987a2b3af92ff5..4ce039874dfcc1af9685acab69c967836080fe11 100644 (file)
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -50,8 +50,8 @@ shp2pgsql$(EXE): $(OBJS) shp2pgsql.o
        $(CC) $(CFLAGS) $(OBJS) shp2pgsql.o $(LDFLAGS) -o $@ 
 
 install: all
-       $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(bindir)/pgsql2shp$(EXE)
-       $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(bindir)/shp2pgsql$(EXE)
+       $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(bindir)/pgsql2shp$(EXE)
+       $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(bindir)/shp2pgsql$(EXE)
 
 clean:
        @rm -f $(OBJS) shp2pgsql.o pgsql2shp.o shp2pgsql$(EXE) pgsql2shp$(EXE)