From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Tue, 3 Feb 2004 21:38:31 +0000 (+0000)
Subject: Added DESTDIR to Makefiles to assist in RPM building.
X-Git-Tag: pgis_0_8_2~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2cb22a27353e097ae8a2fd5ddf76f84df6cff07;p=postgis

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 da282bc3d..68ea9e8d9 100644
--- 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 52ad65c5e..4ce039874 100644
--- 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)