fix postgresql again (it wasn't installing enough stuff into the staging dir)

[openwrt.git] / package / postgresql / Makefile

diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 12fbde5001ae3e7f3211833640809cedbc7a8233..a444fdf51cb1ab918d9b22128e8f948b2da5cdde 100644 (file)
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql
-PKG_VERSION:=7.4.6
+PKG_VERSION:=7.4.7
 PKG_RELEASE:=3
-PKG_MD5SUM:=f0ea2b372a7bdaf2613e92176ebf5e0f
+PKG_MD5SUM:=32dac2916d16287d95e0c958a75161fa
 
 PKG_SOURCE_URL:=\
        ftp://ftp3.us.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
@@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 #      ./configure advertise "--infodir", but does not support it, replaced with "--docdir"
        (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
+               CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
                CPPFLAGS="$$CPPFLAGS -I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                ./configure \
@@ -77,14 +77,24 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        touch $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               $(TARGET_CONFIGURE_OPTS)
+       $(MAKE) -C "$(PKG_BUILD_DIR)/src" \
+               $(TARGET_CONFIGURE_OPTS) \
+               submake-libpq
        touch $(PKG_BUILD_DIR)/.built
 
 $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
+       $(MAKE) -C "$(PKG_BUILD_DIR)/src" \
+               DESTDIR="$(STAGING_DIR)" \
+               install-all-headers
+       $(MAKE) -C "$(PKG_BUILD_DIR)/src/include" \
+               DESTDIR="$(STAGING_DIR)" \
+               install
+       $(MAKE) -C "$(PKG_BUILD_DIR)/src/interfaces/libpq" \
                DESTDIR="$(STAGING_DIR)" \
                install
+       mkdir -p $(STAGING_DIR)/usr/lib
+       cp -a $(PKG_BUILD_DIR)/src/interfaces/libpq/libpq.so* $(STAGING_DIR)/usr/lib/
+       cp $(PKG_BUILD_DIR)/src/interfaces/libpq/libpq.a $(STAGING_DIR)/usr/lib/
 
 $(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) ./ipkg/libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)