From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 12 May 2005 21:55:38 +0000 (+0000)
Subject: fix postgresql again (it wasn't installing enough stuff into the staging dir)
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;ds=sidebyside;h=e55415fe5f6fb1a4505e7379677274effff31630;p=openwrt-10.03%2F.git

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


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@861 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 5c0226646..a444fdf51 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -83,10 +83,18 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 	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
-	cp -a $(PKG_BUILD_DIR)/src/interfaces/libpq/libpq.so* $(STAGING_DIR)/usr/lib
+	$(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)