aboutsummaryrefslogtreecommitdiff
path: root/travis/mingw32
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-09-18 20:32:26 +0200
committerEven Rouault <even.rouault@spatialys.com>2018-09-18 22:58:57 +0200
commitd7366ffdd5cbe5ba6c2d9f917d064085bbc3eddc (patch)
tree69dc7d83ce19b02af586f582cda19065e506d2b4 /travis/mingw32
parent793f403aaddbfff64cabbb609a092c347dd659e9 (diff)
downloadPROJ-d7366ffdd5cbe5ba6c2d9f917d064085bbc3eddc.tar.gz
PROJ-d7366ffdd5cbe5ba6c2d9f917d064085bbc3eddc.zip
Rename nad/ directory as data/
Diffstat (limited to 'travis/mingw32')
-rwxr-xr-xtravis/mingw32/install.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh
index c57b03d3..8abc98ac 100755
--- a/travis/mingw32/install.sh
+++ b/travis/mingw32/install.sh
@@ -18,12 +18,12 @@ find /tmp/proj_autoconf_install
cd ..
# Now with grids
wget http://download.osgeo.org/proj/proj-datumgrid-1.5.zip
-cd nad
+cd data
unzip -o ../proj-datumgrid-1.5.zip
cd ..
# autoconf build with grids
-mkdir build_autoconf_nad
-cd build_autoconf_nad
+mkdir build_autoconf_grids
+cd build_autoconf_grids
CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ../configure --host=x86_64-w64-mingw32 --prefix=/tmp/proj_autoconf_install_nad
make -j3
make install
@@ -33,6 +33,6 @@ cd src
make multistresstest.exe
make test228.exe
cd ..
-PROJ_LIB=../nad src/multistresstest.exe -num_iterations 100000
+PROJ_LIB=../data src/multistresstest.exe -num_iterations 100000
cd ..