Changeset d419478 in freewrt for package/postgresql/Makefile

Timestamp:

Jul 21, 2006, 1:56:32 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

50d34d3

Parents:

2029b2e

Message:

• whitespace cleanup, while here
• move WRKDIR and DISTFILES definition into PKG_template
• define WRKDIR via parent BUILD_DIR instead of going up from WRKSRC
• use a sub-directory as WRKDIR, like BSD
• rename PKG_BUILD_DIR into WRKBUILD
• define WRKBUILD relative via WRKDIR
• rename PKG_INSTALL_DIR into WRKINST
• fix a few dependencies
• make use of common cases in the definition of WRKBUILD and WRKINST, removing many redundant lines
• use WRKDIR instead of BUILD_DIR in places where the latter was used previously
• while here, remove PKG_CAT stuff

this only affects packages, for now

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@303 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/postgresql/Makefile (modified) (5 diffs)

package/postgresql/Makefile

@@ -14 +14 @@
         ftp://ftp.tw.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -25 +22 @@
 
 #       ./configure advertise "--infodir", but does not support it, replaced with "--docdir"
-$(PKG_BUILD_DIR)/.configured:
-        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+$(WRKBUILD)/.configured:
+        (cd $(WRKBUILD); rm -rf config.{cache,status} ; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
@@ -70 +67 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C "$(PKG_BUILD_DIR)/src/include" \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+$(WRKBUILD)/.built:
+        $(MAKE) -C "$(WRKBUILD)/src/include" \
+                DESTDIR="$(WRKINST)" \
                 all install
-        $(MAKE) -C "$(PKG_BUILD_DIR)/src/interfaces/libpq" \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+        $(MAKE) -C "$(WRKBUILD)/src/interfaces/libpq" \
+                DESTDIR="$(WRKINST)" \
                 all install
-        $(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/pg_config" \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+        $(MAKE) -C "$(WRKBUILD)/src/bin/pg_config" \
+                DESTDIR="$(WRKINST)" \
                 includedir="$(STAGING_DIR)/usr/include" \
                 libdir="$(STAGING_DIR)/usr/lib" \
                 all install
-        $(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/psql" \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+        $(MAKE) -C "$(WRKBUILD)/src/bin/psql" \
+                DESTDIR="$(WRKINST)" \
                 all install
         touch $@
@@ -89 +86 @@
 $(IPKG_LIBPQ):
         install -d -m0755 $(IDIR_LIBPQ)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/
         $(RSTRIP) $(IDIR_LIBPQ)
         $(IPKG_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR)
@@ -95 +92 @@
 $(IPKG_PGSQL_CLI):
         install -d -m0755 $(IDIR_PGSQL_CLI)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/psql $(IDIR_PGSQL_CLI)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/psql $(IDIR_PGSQL_CLI)/usr/bin/
         $(RSTRIP) $(IDIR_PGSQL_CLI)
         $(IPKG_BUILD) $(IDIR_PGSQL_CLI) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libpq.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/
         mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/libpq $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/postgresql $(STAGING_DIR)/usr/include/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/
         touch $@