[GRASS-SVN] r67030 - grass/trunk/lib/proj

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Dec 7 02:57:46 PST 2015


Author: martinl
Date: 2015-12-07 02:57:46 -0800 (Mon, 07 Dec 2015)
New Revision: 67030

Modified:
   grass/trunk/lib/proj/Makefile
Log:
libproj: fix nad2bin issue for cygwin

Modified: grass/trunk/lib/proj/Makefile
===================================================================
--- grass/trunk/lib/proj/Makefile	2015-12-07 09:26:29 UTC (rev 67029)
+++ grass/trunk/lib/proj/Makefile	2015-12-07 10:57:46 UTC (rev 67030)
@@ -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,7 +41,10 @@
 	$(INSTALL) $< $@
 endif
 
-$(NAD_DSTFILES): $(NAD_DIR)/%: %.lla | $(NAD_DIR)
+$(NAD_DSTFILES): $(NAD_DIR)/%: $(NAD_BINFILES) | $(NAD_DIR)
+	$(INSTALL_DATA) $< $@
+
+$(NAD_BINFILES): $(OBJDIR)/%: %.lla
 	$(NAD2BIN) $@ < $< 
 
 $(NT_DSTFILES): $(NAD_DIR)/%: % | $(NAD_DIR)



More information about the grass-commit mailing list