From bb89ba784633cfb3af27f2bc6a67dd9e54cee189 Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Wed, 9 Apr 2003 07:19:19 +0000 Subject: added DESTDIR in three missing places git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1141 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- nad/Makefile.am | 6 +++--- nad/Makefile.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nad/Makefile.am b/nad/Makefile.am index aa42419c..7cca0d47 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -7,7 +7,7 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @if [ -f conus.lla ] ; then \ for x in *.lla ; do \ - DEST=$(pkgdatadir)/`basename $$x .lla`; \ + DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ echo "../src/nad2bin $$DEST < $$x"; \ ../src/nad2bin $$DEST < $$x ; \ if [ $$? -ne 0 ] ; then \ @@ -19,8 +19,8 @@ install-data-local: echo "nad2nad NADCON source files not present"; \ fi @if [ -f ntv1_can.dat ] ; then \ - echo $(INSTALL_DATA) ntv1_can.dat $(pkgdatadir)/ntv1_can.dat; \ - $(INSTALL_DATA) ntv1_can.dat $(pkgdatadir)/ntv1_can.dat; \ + echo $(INSTALL_DATA) ntv1_can.dat $(DESTDIR)$(pkgdatadir)/ntv1_can.dat; \ + $(INSTALL_DATA) ntv1_can.dat $(DESTDIR)$(pkgdatadir)/ntv1_can.dat; \ fi diff --git a/nad/Makefile.in b/nad/Makefile.in index 800c032e..40287012 100644 --- a/nad/Makefile.in +++ b/nad/Makefile.in @@ -243,7 +243,7 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @if [ -f conus.lla ] ; then \ for x in *.lla ; do \ - DEST=$(pkgdatadir)/`basename $$x .lla`; \ + DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ echo "../src/nad2bin $$DEST < $$x"; \ ../src/nad2bin $$DEST < $$x ; \ if [ $$? -ne 0 ] ; then \ @@ -255,8 +255,8 @@ install-data-local: echo "nad2nad NADCON source files not present"; \ fi @if [ -f ntv1_can.dat ] ; then \ - echo $(INSTALL_DATA) ntv1_can.dat $(pkgdatadir)/ntv1_can.dat; \ - $(INSTALL_DATA) ntv1_can.dat $(pkgdatadir)/ntv1_can.dat; \ + echo $(INSTALL_DATA) ntv1_can.dat $(DESTDIR)$(pkgdatadir)/ntv1_can.dat; \ + $(INSTALL_DATA) ntv1_can.dat $(DESTDIR)$(pkgdatadir)/ntv1_can.dat; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- cgit v1.2.3