Changeset 9404987 in freewrt for target/linux/package/zd1211/Makefile

Timestamp:

Jul 21, 2006, 5:52:19 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

1d8c05f

Parents:

3438ecb2

Message:

start the WRKDIR conversion here too

package/rules.mk is still broken. I don't get this GNU make shit
tonight any more. Please use r274, I know that one works, for now.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@323 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• target/linux/package/zd1211/Makefile (modified) (4 diffs)

target/linux/package/zd1211/Makefile

@@ -13 +13 @@
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -20 +20 @@
 $(eval $(call PKG_template,KMOD_ZD1211,kmod-$(PKG_NAME),$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built: 
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built: 
+        $(MAKE) -C $(WRKBUILD) \
                 ARCH="$(LINUX_KARCH)" \
                 CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -35 +35 @@
                 KERNEL_SOURCE="$(LINUX_DIR)" \
                 all
-        $(TARGET_CC) $(PKG_BUILD_DIR)/apdbg.c -o $(PKG_BUILD_DIR)/apdbg
+        $(TARGET_CC) $(WRKBUILD)/apdbg.c -o $(WRKBUILD)/apdbg
         touch $@
 
@@ -41 +41 @@
         install -m0755 -d $(IDIR_KMOD_ZD1211)/lib/modules/$(LINUX_VERSION) \
                           $(IDIR_KMOD_ZD1211)/usr/sbin
-        $(CP) $(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX) \
+        $(CP) $(WRKBUILD)/zd1211.$(LINUX_KMOD_SUFFIX) \
                 $(IDIR_KMOD_ZD1211)/lib/modules/$(LINUX_VERSION)/
-        $(CP) $(PKG_BUILD_DIR)/apdbg $(IDIR_KMOD_ZD1211)/usr/sbin/
-        $(CP) $(PKG_BUILD_DIR)/sta $(IDIR_KMOD_ZD1211)/usr/sbin/$(PKG_NAME)-sta
+        $(CP) $(WRKBUILD)/apdbg $(IDIR_KMOD_ZD1211)/usr/sbin/
+        $(CP) $(WRKBUILD)/sta $(IDIR_KMOD_ZD1211)/usr/sbin/$(PKG_NAME)-sta
         $(RSTRIP_KMOD) $(IDIR_KMOD_ZD1211)
         $(IPKG_BUILD) $(IDIR_KMOD_ZD1211) $(PACKAGE_DIR)