Mercurial > mxe-octave
diff src/postgresql.mk @ 3012:100e618349f7
Improve handling of prefix directories by defining HOST_PREFIX and
BUILD_TOOLS_PREFIX variables in top-level Makefile.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 Jun 2013 10:31:04 -0400 |
| parents | dabfd7db980c |
| children | bcc26ffe9a0f |
line wrap: on
line diff
--- a/src/postgresql.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/postgresql.mk Sun Jun 02 10:31:04 2013 -0400 @@ -32,7 +32,7 @@ # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ $($(PKG)_CONFIGURE_FLAGS_OPTION) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ --enable-shared \ @@ -56,12 +56,12 @@ $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= - $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_PREFIX)/include/' # Build a native pg_config. $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile cd '$(1).native' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-rpath \ --without-tcl \ @@ -81,5 +81,5 @@ --with-system-tzdata=/dev/null $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config' + $(LN_SF) '$(HOST_PREFIX)/bin/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' endef