Blob Blame History Raw
diff -rupN proj.4-5.2.0/nad/Makefile.am proj.4-5.2.0-new/nad/Makefile.am
--- proj.4-5.2.0/nad/Makefile.am	2018-09-15 16:08:00.000000000 +0200
+++ proj.4-5.2.0-new/nad/Makefile.am	2019-02-05 14:13:37.364326908 +0100
@@ -13,6 +13,8 @@ TESTFLAKY = $(NADPATH)/testflaky
 TESTDATUMFILE = $(NADPATH)/testdatumfile
 TESTIGN = $(NADPATH)/testIGNF
 
+NAD2BIN = $(top_srcdir)/build_native/src/nad2bin
+
 pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \
 		esri.extra other.extra \
 		CH IGNF \
@@ -30,8 +32,8 @@ process-nad2bin:
 	@if [ -f $(NADPATH)/null.lla -a ! -f null ] || [ -f $(NADPATH)/conus.lla -a ! -f conus ] ; then \
 	  for x in $(NADPATH)/*.lla ; do \
 	    DEST=`basename $$x .lla`; \
-	    echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \
-	    ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
+	    echo "$(NAD2BIN) $$DEST < $$x"; \
+	    $(NAD2BIN) $$DEST < $$x ; \
 	  done; \
 	fi
 
@@ -40,10 +42,10 @@ install-data-local: process-nad2bin
 	@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"; \
-	    ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
+	    echo "$(NAD2BIN) $$DEST < $$x"; \
+	    $(NAD2BIN) $$DEST < $$x ; \
 	    if [ $$? -ne 0 ] ; then \
-		echo "nad2bin$(EXEEXT) failed to install $$DEST"; \
+		echo "nad2bin failed to install $$DEST"; \
 		exit 1; \
 	    fi; \
 	  done; \