Changeset d419478 in freewrt for package/libiconv/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/libiconv/Makefile (modified) (4 diffs)

package/libiconv/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=@GNU/libiconv
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -19 +16 @@
 $(eval $(call PKG_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-        (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(WRKBUILD)/.configured:
+        (cd $(WRKBUILD); rm -rf config.cache; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -48 +45 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built:
+        $(MAKE) -C $(WRKBUILD) \
                 CC=$(TARGET_CC)
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                libdir="$(PKG_INSTALL_DIR)/usr/lib" \
-                includedir="$(PKG_INSTALL_DIR)/usr/include" \
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
+                libdir="$(WRKINST)/usr/lib" \
+                includedir="$(WRKINST)/usr/include" \
                 install-lib
         touch $@
@@ -61 +58 @@
 $(IPKG_LIBICONV):
         install -d -m0755 $(IDIR_LIBICONV)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
         chmod 0644 $(IDIR_LIBICONV)/usr/lib/*
         $(RSTRIP) $(IDIR_LIBICONV)
         $(IPKG_BUILD) $(IDIR_LIBICONV) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/iconv/libiconv.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/iconv/libiconv.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/include/iconv
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/iconv
+        $(CP) $(WRKINST)/usr/include/iconv.h $(STAGING_DIR)/usr/include/iconv
         mkdir -p $(STAGING_DIR)/usr/lib/iconv
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/iconv
+        $(CP) $(WRKINST)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/iconv
         touch $@