Changeset d419478 in freewrt for package/fping

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

package/fping/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://www.fping.com/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
@@ -17 +15 @@
 $(eval $(call PKG_template,FPING,$(PKG_NAME),$(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)" \
@@ -40 +38 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -j1 CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) clean $(PKG_NAME)
-        mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)4
-        $(MAKE) -j1 CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -DIPV6=1" -C $(PKG_BUILD_DIR) clean $(PKG_NAME)
-        mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)6
+$(WRKBUILD)/.built:
+        $(MAKE) -j1 CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(WRKBUILD) clean $(PKG_NAME)
+        mv $(WRKBUILD)/$(PKG_NAME) $(WRKBUILD)/$(PKG_NAME)4
+        $(MAKE) -j1 CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -DIPV6=1" -C $(WRKBUILD) clean $(PKG_NAME)
+        mv $(WRKBUILD)/$(PKG_NAME) $(WRKBUILD)/$(PKG_NAME)6
         touch $@
 
 $(IPKG_FPING):
         mkdir -p $(IDIR_FPING)/usr/bin
-        $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)4 $(IDIR_FPING)/usr/bin/$(PKG_NAME)
-        $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)6 $(IDIR_FPING)/usr/bin/
+        $(CP) $(WRKBUILD)/$(PKG_NAME)4 $(IDIR_FPING)/usr/bin/$(PKG_NAME)
+        $(CP) $(WRKBUILD)/$(PKG_NAME)6 $(IDIR_FPING)/usr/bin/
         $(STRIP) $(IDIR_FPING)/usr/bin/*
         $(IPKG_BUILD) $(IDIR_FPING) $(PACKAGE_DIR)