X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fpostgresql%2FMakefile;h=a444fdf51cb1ab918d9b22128e8f948b2da5cdde;hb=e55415fe5f6fb1a4505e7379677274effff31630;hp=592d4cc346b98168677ac4a862e8f5ecb37b0690;hpb=479be66112401ac3e9712b325ab53060ad2393b5;p=openwrt-10.03%2F.git

diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 592d4cc34..a444fdf51 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -22,11 +22,6 @@ IPKG_LIBPQ:=$(PACKAGE_DIR)/libpq_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 IDIR_LIBPQ:=$(PKG_BUILD_DIR)/ipkg
 INFO_LIBPQ:=$(IPKG_STATE_DIR)/info/libpq.list
 
-EXTRA_CFLAGS:=
-ifeq ($(BR2_GCC_3_4),y)
-	EXTRA_CFLAGS += -fno-unit-at-a-time
-endif
-
 $(DL_DIR)/$(PKG_SOURCE):
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
@@ -82,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)