Changeset d419478 in freewrt for package/gcom

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/gcom/Makefile (modified) (3 diffs)

package/gcom/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://www.pharscape.org/3G/gcom
 PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tgz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 DISTFILES:=
@@ -20 +17 @@
 $(eval $(call PKG_template,GCOM,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.prepared:
-        rm -rf $(PKG_BUILD_DIR)
-        mkdir -p $(PKG_BUILD_DIR)
+$(WRKBUILD)/.prepared:
+        rm -rf $(WRKBUILD)
+        mkdir -p $(WRKBUILD)
         # the .tgz is different - no subdirectory, so do this manually
-        zcat $(DL_DIR)/$(PKG_SOURCE) | (cd $(PKG_BUILD_DIR); $(TAR_EXTRACT) )
-        if [ -d ./patches ]; then $(PATCH) $(PKG_BUILD_DIR) ./patches ; fi
+        zcat $(DL_DIR)/$(PKG_SOURCE) | (cd $(WRKBUILD); $(TAR_EXTRACT) )
+        if [ -d ./patches ]; then $(PATCH) $(WRKBUILD) ./patches ; fi
         touch $@
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built:
+        $(MAKE) -C $(WRKBUILD) \
                 CC="$(TARGET_CC)" \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -40 +37 @@
 $(IPKG_GCOM):
         install -d -m0755 $(IDIR_GCOM)/usr/bin
-        install -m0755 $(PKG_BUILD_DIR)/gcom $(IDIR_GCOM)/usr/bin/
+        install -m0755 $(WRKBUILD)/gcom $(IDIR_GCOM)/usr/bin/
         install -d -m0755 $(IDIR_GCOM)/etc/gcom
         install -m0644 ./files/setpin.gcom $(IDIR_GCOM)/etc/gcom/setpin.gcom