Mercurial > mxe-octave

changeset 1500:09e48fb4aa19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid double unpacking in package postgresql
author Tony Theodore <tonyt@logyst.com>
date Sun, 12 Dec 2010 13:26:38 +1100
parents 9e587ca588dc
children 8d92faf0f697
files src/postgresql.mk
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/postgresql.mk	Sun Dec 12 01:16:13 2010 +0100
+++ b/src/postgresql.mk	Sun Dec 12 13:26:38 2010 +1100
@@ -22,6 +22,7 @@
 endef
 
 define $(PKG)_BUILD
+    cp -Rp '$(1)' '$(1).native'
     # The static OpenSSL libraries are in unix (not win32) naming style.
     $(SED) -i 's,SSLEAY32,SSL,' '$(1)'/configure
     $(SED) -i 's,ssleay32,ssl,' '$(1)'/configure
@@ -57,8 +58,6 @@
     $(INSTALL) -m644 '$(1)/src/include/pg_config.h'    '$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(PREFIX)/$(TARGET)/include/'
     # Build a native pg_config.
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,postgresql)
-    mv '$(1)/$(postgresql_SUBDIR)' '$(1).native'
     $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile
     cd '$(1).native' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \