Mercurial > mxe-octave
diff src/gdal.mk @ 3031:951da75fd09c
improve handling of cross tool prefix
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 09 Jun 2013 09:48:08 -0400 |
| parents | b6c7244a2f66 |
| children | 5ef49fb3299d |
line wrap: on
line diff
--- a/src/gdal.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gdal.mk Sun Jun 09 09:48:08 2013 -0400 @@ -39,7 +39,7 @@ --with-sqlite3='$(HOST_PREFIX)' \ --with-curl='$(HOST_BINDIR)/curl-config' \ --with-geos='$(HOST_BINDIR)/geos-config' \ - --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' \ + --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config' \ --with-gta='$(HOST_PREFIX)' \ --without-odbc \ --without-static-proj4 \ @@ -72,7 +72,7 @@ --without-php \ --without-ruby \ --without-python \ - LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" + LIBS="-ljpeg -lsecur32 `'$(MXE_PKG_CONFIG)' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib $(MAKE) -C '$(1)/port' -j 1 install @@ -81,5 +81,5 @@ $(MAKE) -C '$(1)/alg' -j 1 install $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= - $(LN_SF) '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gdal-config' + $(LN_SF) '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gdal-config' endef