[GRASS-SVN] r67071 - grass/branches/releasebranch_7_0/lib/proj

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-12 04:35:39 -0800 (Sat, 12 Dec 2015)
New Revision: 67071

Modified:
   grass/branches/releasebranch_7_0/lib/proj/Makefile
Log:
libproj: fix nad2bin issue for cygwin
    (merge r67029:30 from trunk)


Modified: grass/branches/releasebranch_7_0/lib/proj/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/lib/proj/Makefile	2015-12-12 03:58:40 UTC (rev 67070)
+++ grass/branches/releasebranch_7_0/lib/proj/Makefile	2015-12-12 12:35:39 UTC (rev 67071)
@@ -23,6 +23,7 @@
 CSV_DIR  = $(ETC)/proj/ogr_csv
 
 NAD_DSTFILES := $(patsubst %.lla,$(NAD_DIR)/%,$(NAD_TABLES))
+NAD_BINFILES := $(patsubst %.lla,$(OBJDIR)/%,$(NAD_TABLES))
 NT_DSTFILES  := $(patsubst %,$(NAD_DIR)/%,$(NT_TABLES))
 CSV_DSTFILES := $(patsubst %,$(CSV_DIR)/%,$(CSV_FILES))
 
@@ -40,9 +41,12 @@
 	$(INSTALL) $< $@
 endif
 
-$(NAD_DSTFILES): $(NAD_DIR)/%: %.lla | $(NAD_DIR)
-	$(NAD2BIN) < $< $@
+$(NAD_DSTFILES): $(NAD_DIR)/%: $(NAD_BINFILES) | $(NAD_DIR)
+	$(INSTALL_DATA) $< $@
 
+$(NAD_BINFILES): $(OBJDIR)/%: %.lla
+	$(NAD2BIN) $@ < $< 
+
 $(NT_DSTFILES): $(NAD_DIR)/%: % | $(NAD_DIR)
 	$(INSTALL_DATA) $< $@