diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/libgeotiff.mk | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/libgeotiff.mk')
| -rw-r--r-- | src/libgeotiff.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk index dd49dc0..2f973f5 100644 --- a/src/libgeotiff.mk +++ b/src/libgeotiff.mk @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GeoTiff PKG := libgeotiff $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0 $(PKG)_CHECKSUM := b8cde5014cf82fe4683fa35fc81a5ea8d64b940f $(PKG)_SUBDIR := libgeotiff-$($(PKG)_VERSION) $(PKG)_FILE := libgeotiff-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://trac.osgeo.org/geotiff/ $(PKG)_URL := http://download.osgeo.org/geotiff/libgeotiff/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/geotiff/libgeotiff/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib jpeg tiff proj @@ -26,7 +23,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - LIBS='-ljpeg -lz' + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz" $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)' rm -fv '$(PREFIX)/$(TARGET)'/bin/*.remove-me endef |