blob: 37a7f7cbcb3bcd17a9de0b40ad2fee0503d50d22 [file] [log] [blame] [edit]
diff -Naur libgeotiff-1.6.0.orig/bin/Makefile.am libgeotiff-1.6.0/bin/Makefile.am
--- libgeotiff-1.6.0.orig/bin/Makefile.am 2020-05-18 13:01:27.078949115 -0400
+++ libgeotiff-1.6.0/bin/Makefile.am 2020-05-18 13:03:10.903759320 -0400
@@ -12,9 +12,9 @@
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
-AM_CFLAGS = -I../ -I$(srcdir)/.. -I$(srcdir)/../libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
-LDADD = ../libgeotiff.la
+LDADD = $(top_builddir)/libgeotiff.la
EXTRA_DIST = getopt.c
diff -Naur libgeotiff-1.6.0.orig/libxtiff/Makefile.am libgeotiff-1.6.0/libxtiff/Makefile.am
--- libgeotiff-1.6.0.orig/libxtiff/Makefile.am 2020-05-18 13:01:27.072282278 -0400
+++ libgeotiff-1.6.0/libxtiff/Makefile.am 2020-05-18 13:03:33.455220288 -0400
@@ -4,7 +4,7 @@
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
-AM_CFLAGS = -I../ -I$(srcdir)/.. $(TIFF_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir) $(TIFF_CFLAGS)
libxtiff_la_SOURCES = xtiff.c
diff -Naur libgeotiff-1.6.0.orig/Makefile.am libgeotiff-1.6.0/Makefile.am
--- libgeotiff-1.6.0.orig/Makefile.am 2020-05-18 13:01:27.082282534 -0400
+++ libgeotiff-1.6.0/Makefile.am 2020-05-18 13:05:11.805886400 -0400
@@ -11,7 +11,7 @@
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
-AM_CFLAGS = -I$(srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
include_HEADERS = geotiff.h \
geotiffio.h \