diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-09-19 17:31:26 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-09-19 17:31:26 +0200 |
| commit | 00f6873a159806cf08a3f51d90776e2840ede946 (patch) | |
| tree | fb7679be7326ad672613e60d30d15545edd88f27 | |
| parent | 4ea0c2d72c80120a6074b97577a2659e23015f5c (diff) | |
| download | PROJ-00f6873a159806cf08a3f51d90776e2840ede946.tar.gz PROJ-00f6873a159806cf08a3f51d90776e2840ede946.zip | |
autoconf: fix 'make check' on out-of-tree builds
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | test/gie/Makefile.am | 2 | ||||
| -rw-r--r-- | test/old/Makefile.am | 2 | ||||
| -rwxr-xr-x | travis/install.sh | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index f85a5ddb..c77efc8b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -45,3 +45,11 @@ install-data-local: process-nad2bin $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ fi; \ done + +# For out-of-tree builds, link all file of the source data dir to the generated data +check-local: process-nad2bin + @if [ ! -f GL27 ]; then \ + for x in $(DATAPATH)/*; do \ + ln -sf $$x .; \ + done \ + fi diff --git a/test/gie/Makefile.am b/test/gie/Makefile.am index 7dc32eba..44facd87 100644 --- a/test/gie/Makefile.am +++ b/test/gie/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = 4D-API_cs2cs-style.gie \ unitconvert.gie \ DHDN_ETRS89.gie -PROJ_LIB ?= $(top_srcdir)/data +PROJ_LIB ?= ../../data 4D-API-cs2cs-style: 4D-API_cs2cs-style.gie PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< diff --git a/test/old/Makefile.am b/test/old/Makefile.am index 9e659280..2848d40a 100644 --- a/test/old/Makefile.am +++ b/test/old/Makefile.am @@ -1,5 +1,5 @@ # Executables paths passed to test scripts -DATAPATH = $(top_srcdir)/data +DATAPATH = ../../data THIS_DIR = $(top_srcdir)/test/old EXEPATH = ../../src PROJEXE = $(EXEPATH)/proj diff --git a/travis/install.sh b/travis/install.sh index eecf343a..be3c1989 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -24,10 +24,8 @@ mkdir build_autoconf cd build_autoconf ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all make -j3 +make check make install -# We have a small issue with out-of-tree builds where the null file is generated in the build directory, but other non-generated stuff is in $(top_srcdir)/data -# Workaround this by using the install directory... -PROJ_LIB=/tmp/proj_autoconf_install_from_dist_all/share/proj make check find /tmp/proj_autoconf_install_from_dist_all cd .. |