[GRASS-SVN] r74185 - in grass/branches/releasebranch_7_4: . include/Make

[svn_grass at osgeo.org]

Author: neteler
Date: 2019-03-07 12:57:41 -0800 (Thu, 07 Mar 2019)
New Revision: 74185

Modified:
   grass/branches/releasebranch_7_4/binaryInstall.src
   grass/branches/releasebranch_7_4/include/Make/Platform.make.in
Log:
Platform.make.in: nad2bin no longer used (completes r74179)

Modified: grass/branches/releasebranch_7_4/binaryInstall.src
===================================================================
--- grass/branches/releasebranch_7_4/binaryInstall.src	2019-03-07 20:57:06 UTC (rev 74184)
+++ grass/branches/releasebranch_7_4/binaryInstall.src	2019-03-07 20:57:41 UTC (rev 74185)
@@ -317,27 +317,6 @@
 
 echo""
 
-echo "Creating datum transformation gridshift files..."
-
-if test -x "${DESTDIR}/etc/proj/nad2bin" ; then
-    NAD2BIN="${DESTDIR}/etc/proj/nad2bin"
-else
-    # Use version installed with PROJ.4 (should be in path)
-    NAD2BIN=nad2bin
-fi
-
-for i in "${DESTDIR}"/etc/proj/nad/src/*.lla
-do 
-    "${NAD2BIN}" < $i \
-    "${DESTDIR}"/etc/proj/nad/`echo \`basename "$i"\` | sed 's/.lla//'` && rm -f "$i"
-done
-
-if test -z "`ls \"${DESTDIR}/etc/proj/nad/src\"`" ; then
-    rmdir "${DESTDIR}/etc/proj/nad/src"
-fi
-
-echo""
-
 echo "Generating display font configuration file..."
 
 GISBASE="$DESTDIR" GISRC=junk LD_LIBRARY_PATH_VAR="${DESTDIR}/lib:$LD_LIBRARY_PATH_VAR" "${DESTDIR}/bin/g.mkfontcap" -o

Modified: grass/branches/releasebranch_7_4/include/Make/Platform.make.in
===================================================================
--- grass/branches/releasebranch_7_4/include/Make/Platform.make.in	2019-03-07 20:57:06 UTC (rev 74184)
+++ grass/branches/releasebranch_7_4/include/Make/Platform.make.in	2019-03-07 20:57:41 UTC (rev 74185)
@@ -191,7 +191,6 @@
 #PROJ.4:
 PROJINC             = @PROJINC@ $(GDALCFLAGS)
 PROJLIB             = @PROJLIB@
-NAD2BIN             = @NAD2BIN@
 PROJSHARE           = @PROJSHARE@
 
 #OPENDWG: