From 579ac1180968e3d3a96cf5bfd73da90e8ce7be25 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 16 Feb 2015 17:41:10 +0000 Subject: apply patch for #247 to support out-of-tree autoconf builds git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2602 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- nad/Makefile.am | 40 +++++++++++++++++++----------- nad/Makefile.in | 73 ++++++++++++++++++++++++++++--------------------------- nad/test27 | 5 ++-- nad/test83 | 5 ++-- nad/testIGNF | 3 ++- nad/testdatumfile | 3 ++- nad/testntv2 | 3 ++- nad/testvarious | 3 ++- 8 files changed, 77 insertions(+), 58 deletions(-) diff --git a/nad/Makefile.am b/nad/Makefile.am index f8ffae8e..101f06db 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -1,15 +1,16 @@ # Executables paths passed to test scripts -EXEPATH = $(top_srcdir)/src +NADPATH = $(top_srcdir)/nad +EXEPATH = ../src PROJEXE = $(EXEPATH)/proj CS2CSEXE = $(EXEPATH)/cs2cs # PROJ.4 test scripts -TEST27 = ./test27 -TEST83 = ./test83 -TESTNTV2 = ./testntv2 -TESTVARIOUS = ./testvarious -TESTDATUMFILE = ./testdatumfile -TESTIGN = ./testIGNF +TEST27 = $(NADPATH)/test27 +TEST83 = $(NADPATH)/test83 +TESTNTV2 = $(NADPATH)/testntv2 +TESTVARIOUS = $(NADPATH)/testvarious +TESTDATUMFILE = $(NADPATH)/testdatumfile +TESTIGN = $(NADPATH)/testIGNF pkgdata_DATA = GL27 nad.lst nad27 nad83 world epsg esri \ esri.extra other.extra \ @@ -23,8 +24,8 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \ makefile.vc CMakeLists.txt process-nad2bin: - @if [ -f null.lla -a ! -f null ] || [ -f conus.lla -a ! -f conus ] ; then \ - for x in *.lla ; do \ + @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 ; \ @@ -33,7 +34,7 @@ process-nad2bin: install-data-local: process-nad2bin $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @for x in *.lla ; do \ + @for x in $(NADPATH)/*.lla ; do \ DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ @@ -42,17 +43,28 @@ install-data-local: process-nad2bin exit 1; \ fi; \ done - @if [ ! -f conus.lla ] ; then \ + @if [ ! -f $(NADPATH)/conus.lla ] ; then \ echo "nad2nad NADCON source files not present"; \ fi - @for gridfile in *.gsb ntv1_can.dat dummy ; do \ + @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ - echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \ - $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \ + echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ + $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ fi; \ done check-local: process-nad2bin +# Check if we are doing an out-of-tree build + @if test ! -f epsg; then \ + for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ + if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ + cp $$gridfile .; \ + fi; \ + done; \ + for gridfile in $(pkgdata_DATA); do \ + cp $(NADPATH)/$$gridfile .; \ + done; \ + fi $(TEST27) $(PROJEXE) $(TEST83) $(PROJEXE) PROJ_LIB=. $(TESTVARIOUS) $(CS2CSEXE) diff --git a/nad/Makefile.in b/nad/Makefile.in index 010f37e3..0ce0811e 100644 --- a/nad/Makefile.in +++ b/nad/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,12 +70,6 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } am__installdirs = "$(DESTDIR)$(pkgdatadir)" DATA = $(pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -95,7 +89,6 @@ CYGPATH_W = @CYGPATH_W@ C_WFLAGS = @C_WFLAGS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -121,7 +114,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MUTEX_SETTING = @MUTEX_SETTING@ NM = @NM@ @@ -148,7 +140,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -181,6 +172,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -198,17 +190,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Executables paths passed to test scripts -EXEPATH = $(top_srcdir)/src +NADPATH = $(top_srcdir)/nad +EXEPATH = ../src PROJEXE = $(EXEPATH)/proj CS2CSEXE = $(EXEPATH)/cs2cs # PROJ.4 test scripts -TEST27 = ./test27 -TEST83 = ./test83 -TESTNTV2 = ./testntv2 -TESTVARIOUS = ./testvarious -TESTDATUMFILE = ./testdatumfile -TESTIGN = ./testIGNF +TEST27 = $(NADPATH)/test27 +TEST83 = $(NADPATH)/test83 +TESTNTV2 = $(NADPATH)/testntv2 +TESTVARIOUS = $(NADPATH)/testvarious +TESTDATUMFILE = $(NADPATH)/testdatumfile +TESTIGN = $(NADPATH)/testIGNF pkgdata_DATA = GL27 nad.lst nad27 nad83 world epsg esri \ esri.extra other.extra \ CH IGNF @@ -276,7 +269,9 @@ uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -332,15 +327,10 @@ install-am: all-am installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -435,8 +425,8 @@ uninstall-am: uninstall-pkgdataDATA process-nad2bin: - @if [ -f null.lla -a ! -f null ] || [ -f conus.lla -a ! -f conus ] ; then \ - for x in *.lla ; do \ + @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 ; \ @@ -445,7 +435,7 @@ process-nad2bin: install-data-local: process-nad2bin $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @for x in *.lla ; do \ + @for x in $(NADPATH)/*.lla ; do \ DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \ echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ @@ -454,17 +444,28 @@ install-data-local: process-nad2bin exit 1; \ fi; \ done - @if [ ! -f conus.lla ] ; then \ + @if [ ! -f $(NADPATH)/conus.lla ] ; then \ echo "nad2nad NADCON source files not present"; \ fi - @for gridfile in *.gsb ntv1_can.dat dummy ; do \ + @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ - echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \ - $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \ + echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ + $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ fi; \ done check-local: process-nad2bin +# Check if we are doing an out-of-tree build + @if test ! -f epsg; then \ + for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ + if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ + cp $$gridfile .; \ + fi; \ + done; \ + for gridfile in $(pkgdata_DATA); do \ + cp $(NADPATH)/$$gridfile .; \ + done; \ + fi $(TEST27) $(PROJEXE) $(TEST83) $(PROJEXE) PROJ_LIB=. $(TESTVARIOUS) $(CS2CSEXE) diff --git a/nad/test27 b/nad/test27 index 583f6032..66f6f1c4 100755 --- a/nad/test27 +++ b/nad/test27 @@ -6,6 +6,7 @@ # Proj will vary in the .001ft range with projections using Transverse # Mercator due to greater precision of meridinal distance function. # +NAD_DIR=`dirname $0` EXE=$1 usage() @@ -29,7 +30,7 @@ echo "Running ${0} using ${EXE}:" echo "============================================" OUT=proj_out27 -INIT_FILE=./nad27 +INIT_FILE=${NAD_DIR}/nad27 # echo "doing tests into file ${OUT}, please wait" # @@ -831,7 +832,7 @@ EOF # # do 'diff' with distribution results echo "diff ${OUT} with pj_out27.dist" -diff -b ${OUT} pj_out27.dist +diff -b ${OUT} ${NAD_DIR}/pj_out27.dist if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURED" diff --git a/nad/test83 b/nad/test83 index 2de16ab7..4dcb15e4 100755 --- a/nad/test83 +++ b/nad/test83 @@ -7,6 +7,7 @@ # Proj will vary in the .001ft range with projections using Transverse # Mercator due to greater precision of meridinal distance function. # +NAD_DIR=`dirname $0` EXE=$1 usage() @@ -30,7 +31,7 @@ echo "Running ${0} using ${EXE}:" echo "============================================" OUT=proj_out83 -INIT_FILE=./nad83 +INIT_FILE=${NAD_DIR}/nad83 # echo "doing tests into file ${OUT}, please wait" # @@ -712,7 +713,7 @@ EOF # # do 'diff' with distribution results echo "diff ${OUT} with pj_out83.dist" -diff -b ${OUT} pj_out83.dist +diff -b ${OUT} ${NAD_DIR}/pj_out83.dist if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURED" diff --git a/nad/testIGNF b/nad/testIGNF index 15226774..6f8437f3 100755 --- a/nad/testIGNF +++ b/nad/testIGNF @@ -10,6 +10,7 @@ # transformations will be wrong and vice-versa # 2009-10-04 : addition of NTFG to RGF93G test to check if # the gsb grid is still ok +NAD_DIR=`dirname $0` EXE=$1 usage() @@ -150,7 +151,7 @@ EOF # # do 'diff' with distribution results echo "diff ${OUT} with ${OUT}.dist" -diff -b ${OUT} ${OUT}.dist +diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURED" diff --git a/nad/testdatumfile b/nad/testdatumfile index e03d1d8b..e3f2764f 100755 --- a/nad/testdatumfile +++ b/nad/testdatumfile @@ -3,6 +3,7 @@ # files that are not always available. # # +NAD_DIR=`dirname $0` EXE=$1 usage() @@ -97,7 +98,7 @@ EOF # Done! # do 'diff' with distribution results echo "diff ${OUT} with ${OUT}.dist" -diff -b ${OUT} ${OUT}.dist +diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURED" diff --git a/nad/testntv2 b/nad/testntv2 index 5a9e1a73..669517d5 100755 --- a/nad/testntv2 +++ b/nad/testntv2 @@ -3,6 +3,7 @@ # Test NTv2 (.gsb) support. Assumes ntv2_0.gsb is installed. # # +NAD_DIR=`dirname $0` EXE=$1 usage() @@ -56,7 +57,7 @@ EOF # Done! # do 'diff' with distribution results echo "diff ${OUT} with ${OUT}.dist" -diff -b ${OUT} ${OUT}.dist +diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURED" diff --git a/nad/testvarious b/nad/testvarious index 4c427cd3..08eb546b 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -3,6 +3,7 @@ # on datum files. # # +NAD_DIR=`dirname $0` EXE=$1 usage() @@ -701,7 +702,7 @@ EOF # Done! # do 'diff' with distribution results echo "diff ${OUT} with ${OUT}.dist" -diff -b ${OUT} ${OUT}.dist +diff -b ${OUT} ${NAD_DIR}/${OUT}.dist if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURED" -- cgit v1.2.3