aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Butler <howard@hobu.co>2015-09-08 19:56:08 -0500
committerHoward Butler <howard@hobu.co>2015-09-08 19:56:08 -0500
commit759c0bad01193f61aaa0b5f01de71c400c2699fd (patch)
tree8a90be24a50d55ecc0b4a6a2852462894f45d171
parentbd3d58c0d22c203b07764f0669159c37b1f9288c (diff)
parentbe5192a0abbf94b82b9ceadbe7367532b285363a (diff)
downloadPROJ-759c0bad01193f61aaa0b5f01de71c400c2699fd.tar.gz
PROJ-759c0bad01193f61aaa0b5f01de71c400c2699fd.zip
Merge pull request #301 from sebastic/proj-datumgrids-duplicates
Don't include files in proj dist, also included in proj-datumgrids dist.
-rw-r--r--nad/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/nad/Makefile.am b/nad/Makefile.am
index 705d65eb..e4379108 100644
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
@@ -15,15 +15,15 @@ TESTIGN = $(NADPATH)/testIGNF
pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \
esri.extra other.extra \
- CH IGNF testIGNF proj_outIGNF.dist \
- null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt
+ CH IGNF
EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \
test27 test83 world epsg esri tv_out.dist tf_out.dist \
testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
esri.extra other.extra \
CH IGNF testIGNF proj_outIGNF.dist \
- null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt
+ makefile.vc CMakeLists.txt
+
process-nad2bin:
@if [ -f $(NADPATH)/null.lla -a ! -f null ] || [ -f $(NADPATH)/conus.lla -a ! -f conus ] ; then \
for x in $(NADPATH)/*.lla ; do \