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

package/udev/Makefile

@@ -15 +15 @@
         http://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -23 +20 @@
 $(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built:
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
                 CROSS="$(TARGET_CROSS)" \
                 STRIP="/bin/true" \
                 OPTFLAGS="$(TARGET_CFLAGS)" \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+                DESTDIR="$(WRKINST)" \
                 INSTALL="install -c" \
                 all install
@@ -40 +37 @@
 $(IPKG_UDEV):
         install -d -m0775 $(IDIR_UDEV)/etc/udev
-        $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/
+        $(CP) $(WRKINST)/etc/udev/* $(IDIR_UDEV)/etc/udev/
         install -d -m0775 $(IDIR_UDEV)/lib/udev
         install -d -m0775 $(IDIR_UDEV)/sbin/
-        $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/
-        $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/
-        $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/
-        $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/
-        $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/
+        $(CP) $(WRKINST)/sbin/udev $(IDIR_UDEV)/sbin/
+        $(CP) $(WRKINST)/sbin/udevcontrol $(IDIR_UDEV)/sbin/
+        $(CP) $(WRKINST)/sbin/udevd $(IDIR_UDEV)/sbin/
+        $(CP) $(WRKINST)/sbin/udevsend $(IDIR_UDEV)/sbin/
+        $(CP) $(WRKINST)/sbin/udevstart $(IDIR_UDEV)/sbin/
         install -d -m0775 $(IDIR_UDEV)/usr/bin/
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/
         install -d -m0775 $(IDIR_UDEV)/usr/sbin/
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/
         $(RSTRIP) $(IDIR_UDEV)
         $(IPKG_BUILD) $(IDIR_UDEV) $(PACKAGE_DIR)
 
 mostlyclean:
-        -$(MAKE) -C $(PKG_BUILD_DIR) clean
-        rm -f $(PKG_BUILD_DIR)/.built
+        -$(MAKE) -C $(WRKBUILD) clean
+        rm -f $(WRKBUILD)/.built