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

package/mrd6/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://hng.av.it.pt/mrd6/download/
 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,MRD6,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C $(PKG_BUILD_DIR)/src \
+$(WRKBUILD)/.built:
+        $(MAKE) -C $(WRKBUILD)/src \
                 OPTIMIZE=yes \
                 SPACE_OPTIMIZE=yes \
@@ -31 +28 @@
                 CC=$(TARGET_CC) \
                 STAGING_DIR=$(STAGING_DIR) \
-                DESTDIR=$(PKG_INSTALL_DIR) \
+                DESTDIR=$(WRKINST) \
                 PREFIX=/usr/ \
                 install
-        install -d -m0755 $(PKG_INSTALL_DIR)/etc/init.d
-        install -m0644 files/$(PKG_NAME).conf $(PKG_INSTALL_DIR)/etc
-        install -m0755 files/$(PKG_NAME).init $(PKG_INSTALL_DIR)/etc/init.d/S60$(PKG_NAME)
+        install -d -m0755 $(WRKINST)/etc/init.d
+        install -m0644 files/$(PKG_NAME).conf $(WRKINST)/etc
+        install -m0755 files/$(PKG_NAME).init $(WRKINST)/etc/init.d/S60$(PKG_NAME)
         touch $@
 
 $(IPKG_MRD6): 
         mkdir -p $(IDIR_MRD6)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/ $(IDIR_MRD6)/
+        $(CP) $(WRKINST)/ $(IDIR_MRD6)/
         $(RSTRIP) $(IDIR_MRD6)/
         $(IPKG_BUILD) $(IDIR_MRD6) $(PACKAGE_DIR)