Mercurial > mxe-octave
comparison src/postgresql.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 |
---|---|
53 --with-system-tzdata=/dev/null \ | 53 --with-system-tzdata=/dev/null \ |
54 LIBS="$($(PKG)_LIBS) `'$(TARGET)-pkg-config' openssl --libs`" | 54 LIBS="$($(PKG)_LIBS) `'$(TARGET)-pkg-config' openssl --libs`" |
55 $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= | 55 $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= |
56 $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= | 56 $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= |
57 $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= | 57 $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= |
58 $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(HOST_PREFIX)/include/' | 58 $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(HOST_INCDIR)' |
59 $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_PREFIX)/include/' | 59 $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_INCDIR)' |
60 # Build a native pg_config. | 60 # Build a native pg_config. |
61 $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile | 61 $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile |
62 cd '$(1).native' && ./configure \ | 62 cd '$(1).native' && ./configure \ |
63 --prefix='$(HOST_PREFIX)' \ | 63 --prefix='$(HOST_PREFIX)' \ |
64 $(ENABLE_SHARED_OR_STATIC) \ | 64 $(ENABLE_SHARED_OR_STATIC) \ |
78 --without-libxslt \ | 78 --without-libxslt \ |
79 --without-zlib \ | 79 --without-zlib \ |
80 --with-system-tzdata=/dev/null | 80 --with-system-tzdata=/dev/null |
81 $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' | 81 $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' |
82 $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install | 82 $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install |
83 $(LN_SF) '$(HOST_PREFIX)/bin/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' | 83 $(LN_SF) '$(HOST_BINDIR)/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' |
84 endef | 84 endef |