diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2015-02-21 10:45:33 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@mines-paris.org> | 2015-02-21 10:45:33 +0000 |
| commit | e8bb7e6cfbc9adfa1d051b8867a4eb5f35b63987 (patch) | |
| tree | cee9f6e52355b8fb6782ac53a55235de68b8f94e | |
| parent | 5e1df86165d32a78d379b1f339fcc56b5fae0788 (diff) | |
| download | PROJ-e8bb7e6cfbc9adfa1d051b8867a4eb5f35b63987.tar.gz PROJ-e8bb7e6cfbc9adfa1d051b8867a4eb5f35b63987.zip | |
fix install target when no .lla files are in nad subdirectory
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2618 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nad/Makefile.am | 9 |
2 files changed, 9 insertions, 4 deletions
@@ -1,4 +1,8 @@ 2015-02-21 Even Rouault <even.rouault@spatialys.com> + * nad/Makefile.am: fix install target when no .lla files are in + nad subdirectory. + +2015-02-21 Even Rouault <even.rouault@spatialys.com> * cmake/Makefile.am man/Makefile.am: install missing CMake support files for dist-all target diff --git a/nad/Makefile.am b/nad/Makefile.am index 101f06db..f16fbc74 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -34,7 +34,10 @@ process-nad2bin: install-data-local: process-nad2bin $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @for x in $(NADPATH)/*.lla ; do \ + @if [ ! -f $(NADPATH)/conus.lla ] ; then \ + echo "nad2nad NADCON source files not present"; \ + else \ + for x in $(NADPATH)/*.lla ; do \ DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ @@ -42,9 +45,7 @@ install-data-local: process-nad2bin echo "nad2bin$(EXEEXT) failed to install $$DEST"; \ exit 1; \ fi; \ - done - @if [ ! -f $(NADPATH)/conus.lla ] ; then \ - echo "nad2nad NADCON source files not present"; \ + done; \ fi @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ |