diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2015-02-21 12:10:35 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@mines-paris.org> | 2015-02-21 12:10:35 +0000 |
| commit | 73a1f0f5d0674ac727b9e75e863ff34e5054b94c (patch) | |
| tree | 4bdf7e971a6cdc394c8d1321e65c0999ede1dc98 | |
| parent | e8bb7e6cfbc9adfa1d051b8867a4eb5f35b63987 (diff) | |
| download | PROJ-73a1f0f5d0674ac727b9e75e863ff34e5054b94c.tar.gz PROJ-73a1f0f5d0674ac727b9e75e863ff34e5054b94c.zip | |
nad/Makefile.am: compatibility with proj-datumgrids-1.6RC1 (patch by sebastic, #249)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2619 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nad/Makefile.am | 11 |
2 files changed, 11 insertions, 4 deletions
@@ -1,4 +1,8 @@ 2015-02-21 Even Rouault <even.rouault@spatialys.com> + * nad/Makefile.am: compatibility with proj-datumgrids-1.6RC1 + (patch by sebastic, #249) + +2015-02-21 Even Rouault <even.rouault@spatialys.com> * nad/Makefile.am: fix install target when no .lla files are in nad subdirectory. diff --git a/nad/Makefile.am b/nad/Makefile.am index f16fbc74..206524bd 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -34,9 +34,7 @@ process-nad2bin: install-data-local: process-nad2bin $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @if [ ! -f $(NADPATH)/conus.lla ] ; then \ - echo "nad2nad NADCON source files not present"; \ - else \ + @if [ -f $(NADPATH)/null.lla -a ! -f $(NADPATH)/null ] || [ -f $(NADPATH)/conus.lla -a ! -f $(NADPATH)/conus ] ; then \ for x in $(NADPATH)/*.lla ; do \ DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ @@ -46,8 +44,13 @@ install-data-local: process-nad2bin exit 1; \ fi; \ done; \ + else \ + echo "nad2nad NADCON source files not present"; \ fi - @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ + @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy \ + $(NADPATH)/alaska $(NADPATH)/conus $(NADPATH)/hawaii $(NADPATH)/null \ + $(NADPATH)/prvi $(NADPATH)/stgeorge $(NADPATH)/stlrnc $(NADPATH)/stpaul \ + $(NADPATH)/FL $(NADPATH)/MD $(NADPATH)/TN $(NADPATH)/WI $(NADPATH)/WO; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ |