# HG changeset patch # User John Donoghue # Date 1388790355 18000 # Node ID 1ad098269cfbc3038935de58977b42df8e3109cb # Parent 83a5cb70a8001a5246a6ebb269a4eaa2d817b962 postgresql: create and install host pg_config tool. * src/postgresql.mk: install host pg_config tool, use DESTDIR in install. diff -r 83a5cb70a800 -r 1ad098269cfb src/postgresql.mk --- a/src/postgresql.mk Fri Jan 03 15:26:10 2014 -0500 +++ b/src/postgresql.mk Fri Jan 03 18:05:55 2014 -0500 @@ -14,7 +14,7 @@ endif ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_LIGS := -lsecur32 + $(PKG)_LIBS := -lsecur32 endif define $(PKG)_UPDATE @@ -52,17 +52,18 @@ --with-zlib \ --with-system-tzdata=/dev/null \ LIBS="$($(PKG)_LIBS) `'$(MXE_PKG_CONFIG)' openssl --libs`" - $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= + $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= DESTDIR='$(3)' $(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' '$(HOST_INCDIR)' - $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_INCDIR)' - $(INSTALL) -d '$(HOST_INCDIR)/libpq' - $(INSTALL) -m644 '$(1)'/src/include/libpq/* '$(HOST_INCDIR)/libpq/' + $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= DESTDIR='$(3)' + $(MAKE) -C '$(1)'/src/bin/pg_config -j '$(JOBS)' install haslibarule= DESTDIR='$(3)' + $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(3)$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(3)$(HOST_INCDIR)' + $(INSTALL) -d '$(3)$(HOST_INCDIR)/libpq' + $(INSTALL) -m644 '$(1)'/src/include/libpq/* '$(3)$(HOST_INCDIR)/libpq/' # 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='$(HOST_PREFIX)' \ + --prefix='$(BUILD_TOOLS_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-rpath \ --without-tcl \ @@ -81,8 +82,8 @@ --without-zlib \ --with-system-tzdata=/dev/null $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' - $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install + $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install DESTDIR=$(3) if [ $(MXE_NATIVE_BUILD) = no ]; then \ - $(INSTALL) -m755 '$(HOST_BINDIR)/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'; \ + $(INSTALL) -m755 '$(3)$(BUILD_TOOLS_PREFIX)/bin/pg_config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'; \ fi endef