Mercurial > mxe-octave
comparison src/gdal.mk @ 3014:b6c7244a2f66
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 02 Jun 2013 16:59:24 -0400 |
parents | bcc26ffe9a0f |
children | 951da75fd09c |
comparison
equal
deleted
inserted
replaced
3013:bcc26ffe9a0f | 3014:b6c7244a2f66 |
---|---|
35 --with-jpeg='$(HOST_PREFIX)' \ | 35 --with-jpeg='$(HOST_PREFIX)' \ |
36 --with-jasper='$(HOST_PREFIX)' \ | 36 --with-jasper='$(HOST_PREFIX)' \ |
37 --with-gif='$(HOST_PREFIX)' \ | 37 --with-gif='$(HOST_PREFIX)' \ |
38 --with-expat='$(HOST_PREFIX)' \ | 38 --with-expat='$(HOST_PREFIX)' \ |
39 --with-sqlite3='$(HOST_PREFIX)' \ | 39 --with-sqlite3='$(HOST_PREFIX)' \ |
40 --with-curl='$(HOST_PREFIX)/bin/curl-config' \ | 40 --with-curl='$(HOST_BINDIR)/curl-config' \ |
41 --with-geos='$(HOST_PREFIX)/bin/geos-config' \ | 41 --with-geos='$(HOST_BINDIR)/geos-config' \ |
42 --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' \ | 42 --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' \ |
43 --with-gta='$(HOST_PREFIX)' \ | 43 --with-gta='$(HOST_PREFIX)' \ |
44 --without-odbc \ | 44 --without-odbc \ |
45 --without-static-proj4 \ | 45 --without-static-proj4 \ |
46 --without-xerces \ | 46 --without-xerces \ |
79 $(MAKE) -C '$(1)/gcore' -j 1 install | 79 $(MAKE) -C '$(1)/gcore' -j 1 install |
80 $(MAKE) -C '$(1)/frmts' -j 1 install | 80 $(MAKE) -C '$(1)/frmts' -j 1 install |
81 $(MAKE) -C '$(1)/alg' -j 1 install | 81 $(MAKE) -C '$(1)/alg' -j 1 install |
82 $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= | 82 $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= |
83 $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= | 83 $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= |
84 $(LN_SF) '$(HOST_PREFIX)/bin/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gdal-config' | 84 $(LN_SF) '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gdal-config' |
85 endef | 85 endef |