summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 21:55:38 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 21:55:38 +0000
commit506a7641036719a7c39321caf3613af7c89e97d5 (patch)
tree07e94df50013351ce8fcb64c190226647e6f13f9
parent83aa20e314ae2bf9c7851279cf152352a9f99318 (diff)
fix postgresql again (it wasn't installing enough stuff into the staging dir)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@861 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/postgresql/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/openwrt/package/postgresql/Makefile b/openwrt/package/postgresql/Makefile
index 5c0226646f..a444fdf51c 100644
--- a/openwrt/package/postgresql/Makefile
+++ b/openwrt/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)