From fb323b6c746abfa2e69973869eae2b995745cbd2 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 18 Apr 2005 06:34:57 +0000
Subject: Uniformize package Makefile, move ipkg related files to ./ipkg
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@665 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/postgresql/Makefile | 4 +-
package/postgresql/ipkg/libpq-dev/CONTROL/control | 8 --
package/postgresql/ipkg/libpq.control | 8 ++
package/postgresql/ipkg/libpq/CONTROL/control | 8 --
.../postgresql/ipkg/pgsql-utils/CONTROL/control | 9 --
package/postgresql/ipkg/rules | 150 ---------------------
package/postgresql/ipkg/version | 1 -
package/postgresql/libpq.control | 8 --
8 files changed, 10 insertions(+), 186 deletions(-)
delete mode 100644 package/postgresql/ipkg/libpq-dev/CONTROL/control
create mode 100644 package/postgresql/ipkg/libpq.control
delete mode 100644 package/postgresql/ipkg/libpq/CONTROL/control
delete mode 100644 package/postgresql/ipkg/pgsql-utils/CONTROL/control
delete mode 100644 package/postgresql/ipkg/rules
delete mode 100644 package/postgresql/ipkg/version
delete mode 100644 package/postgresql/libpq.control
(limited to 'package/postgresql')
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 3582a8916..12fbde500 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -87,9 +87,9 @@ $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
install
$(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+ $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) ./ipkg/libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(IDIR_LIBPQ)/usr/lib
- cp -fp $(STAGING_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/
+ cp -fpR $(STAGING_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/
$(STRIP) $(IDIR_LIBPQ)/usr/lib/*.so*
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR)
diff --git a/package/postgresql/ipkg/libpq-dev/CONTROL/control b/package/postgresql/ipkg/libpq-dev/CONTROL/control
deleted file mode 100644
index 0e0d622cd..000000000
--- a/package/postgresql/ipkg/libpq-dev/CONTROL/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: libpq-dev
-Priority: optional
-Section: devel
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/postgresql/
-Description: PostgreSQL development package
diff --git a/package/postgresql/ipkg/libpq.control b/package/postgresql/ipkg/libpq.control
new file mode 100644
index 000000000..56bdf2e72
--- /dev/null
+++ b/package/postgresql/ipkg/libpq.control
@@ -0,0 +1,8 @@
+Package: libpq
+Priority: optional
+Section: libs
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/postgresql/
+Description: PostgreSQL client library
diff --git a/package/postgresql/ipkg/libpq/CONTROL/control b/package/postgresql/ipkg/libpq/CONTROL/control
deleted file mode 100644
index 56bdf2e72..000000000
--- a/package/postgresql/ipkg/libpq/CONTROL/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: libpq
-Priority: optional
-Section: libs
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/postgresql/
-Description: PostgreSQL client library
diff --git a/package/postgresql/ipkg/pgsql-utils/CONTROL/control b/package/postgresql/ipkg/pgsql-utils/CONTROL/control
deleted file mode 100644
index 6bda983e3..000000000
--- a/package/postgresql/ipkg/pgsql-utils/CONTROL/control
+++ /dev/null
@@ -1,9 +0,0 @@
-Package: pgsql-utils
-Priority: optional
-Section: libs
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/postgresql/
-Description: some PostgreSQL client utilities
-Depends: libpq
diff --git a/package/postgresql/ipkg/rules b/package/postgresql/ipkg/rules
deleted file mode 100644
index ed5b3ee0e..000000000
--- a/package/postgresql/ipkg/rules
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-
-ifneq ($(strip ${IPKG_RULES_INC}),)
- include $(IPKG_RULES_INC)
-endif
-
-##
-
-PKG_VERSION := $(shell cat ./ipkg/version)
-CURRENT_DIR := $(shell pwd)
-INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install
-
-unexport INSTALL_DIR
-
-I_LIBPQ := ipkg/libpq
-I_LIBPQ_DEV := ipkg/libpq-dev
-I_PGSQL_UTILS := ipkg/pgsql-utils
-
-BUILD_DEPS := \
-# $(STAGING_DIR)/usr/include/zlib.h \
-
-CONFIGURE_OPTS = \
- --enable-shared \
- --enable-static \
- --disable-integer-datetimes \
- --disable-rpath \
- --without-tcl \
- --without-tk \
- --without-perl \
- --without-python \
- --without-java \
- --without-krb4 \
- --without-krb5 \
- --without-pam \
- --without-openssl \
- --without-rendezvous \
- --without-readline \
- --with-zlib \
-
-##
-
-all: package
-
-
-.stamp-configured: $(BUILD_DEPS)
-
- rm -rf config.cache
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --datadir=/usr/share \
- --includedir=/usr/include \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --mandir=/usr/share/man \
- --sbindir=/usr/sbin \
- --sysconfdir=/etc \
- $(DISABLE_LARGEFILE) \
- $(DISABLE_NLS) \
- $(CONFIGURE_OPTS) \
-
- touch .stamp-configured
-
-
-.stamp-built: .stamp-configured
-
- $(MAKE)
-
- touch .stamp-built
-
-
-$(INSTALL_DIR)/usr/bin/psql: .stamp-built
-
- mkdir -p $(INSTALL_DIR)
-
- $(MAKE) \
- DESTDIR="$(INSTALL_DIR)" \
- install
-
-
-configure: .stamp-configured
-
-
-build: .stamp-built
-
-
-install: $(INSTALL_DIR)/usr/bin/psql
-
-
-package: $(INSTALL_DIR)/usr/bin/psql
-
- mkdir -p $(I_LIBPQ)/usr/lib/
- cp -fpR $(INSTALL_DIR)/usr/lib/libpq*.so.* $(I_LIBPQ)/usr/lib/
- $(STRIP) $(I_LIBPQ)/usr/lib/lib*.so.*
-
- mkdir -p $(I_LIBPQ_DEV)/usr/bin
- cp -fpR $(INSTALL_DIR)/usr/bin/pg_config $(I_LIBPQ_DEV)/usr/bin/
- mkdir -p $(I_LIBPQ_DEV)/usr/include
- cp -fpR $(INSTALL_DIR)/usr/include/* $(I_LIBPQ_DEV)/usr/include/
- mkdir -p $(I_LIBPQ_DEV)/usr/lib/
- cp -fpR $(INSTALL_DIR)/usr/lib/lib*.a $(I_LIBPQ_DEV)/usr/lib/
- cp -fpR $(INSTALL_DIR)/usr/lib/lib*.so* $(I_LIBPQ_DEV)/usr/lib/
-
- mkdir -p $(I_PGSQL_UTILS)/usr/bin
- cp -fpR $(INSTALL_DIR)/usr/bin/psql $(I_PGSQL_UTILS)/usr/bin/
- $(STRIP) $(I_PGSQL_UTILS)/usr/bin/*
-
- chmod 0755 ipkg/*/CONTROL/
- chmod 0644 ipkg/*/CONTROL/control
-
- perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control
-ifneq ($(strip $(PKG_VERSION)),)
- perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
-endif
-
- $(IPKG_BUILD) $(I_LIBPQ) $(IPKG_TARGET_DIR)
- $(IPKG_BUILD) $(I_LIBPQ_DEV) $(IPKG_TARGET_DIR)
- $(IPKG_BUILD) $(I_PGSQL_UTILS) $(IPKG_TARGET_DIR)
-
-
-clean:
-
- $(MAKE) \
- DESTDIR="$(INSTALL_DIR)" \
- uninstall clean
-
- rm -rf .stamp-* \
- $(I_LIBPQ)/usr \
- $(I_LIBPQ_DEV)/usr \
- $(I_PGSQL_UTILS)/usr \
-
-
-control:
-
- @cat $(I_LIBPQ)/CONTROL/control
- @echo
- @cat $(I_LIBPQ_DEV)/CONTROL/control
- @echo
- @cat $(I_PGSQL_UTILS)/CONTROL/control
- @echo
-
-
-.PHONY: configure build install package clean control
diff --git a/package/postgresql/ipkg/version b/package/postgresql/ipkg/version
deleted file mode 100644
index dfa12552d..000000000
--- a/package/postgresql/ipkg/version
+++ /dev/null
@@ -1 +0,0 @@
-7.4.6-3
diff --git a/package/postgresql/libpq.control b/package/postgresql/libpq.control
deleted file mode 100644
index 56bdf2e72..000000000
--- a/package/postgresql/libpq.control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: libpq
-Priority: optional
-Section: libs
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/postgresql/
-Description: PostgreSQL client library
--
cgit v1.2.3