Changeset d419478 in freewrt for package/pwlib

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/pwlib/Makefile (modified) (4 diffs)

package/pwlib/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://trash.uid0.hu/openwrt
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(TOPDIR)/package/rules.mk
@@ -18 +16 @@
 $(eval $(call PKG_template,PWLIB,pwlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-        ( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+$(WRKBUILD)/.configured:
+        ( cd $(WRKBUILD); rm -rf config.{cache,status}; \
                 CFLAGS="$(TARGET_CFLAGS)" \
                 CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti"  \
@@ -89 +87 @@
                         --disable-xmlrpc \
         );
-        ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME)
+        ln -sf $(PKG_NAME)-$(PKG_VERSION) ${WRKDIR}/$(PKG_NAME)
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built:
+        $(MAKE) -C $(WRKBUILD) \
                 $(TARGET_CONFIGURE_OPTS) \
                 optnoshared
@@ -99 +97 @@
 
 uninstall-link:
-        rm -f $(BUILD_DIR)/$(PKG_NAME)
+        rm -f ${WRKDIR}/$(PKG_NAME)
 
-compile-targets: $(PKG_BUILD_DIR)/.built
+compile-targets: $(WRKBUILD)/.built
 clean-targets: uninstall-link