Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • target/linux/package/madwifi-old/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    1616
    1717ifeq ($(ARCH),mips)
     
    3636BUS_MODULES:=
    3737ifeq ($(findstring AHB,$(BUS)),AHB)
    38 BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
     38BUS_MODULES+=$(WRKBUILD)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
    3939endif
    4040ifeq ($(findstring PCI,$(BUS)),PCI)
    41 BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
     41BUS_MODULES+=$(WRKBUILD)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
    4242endif
    4343
     
    4747$(eval $(call PKG_template,KMOD_MADWIFI_OLD,kmod-madwifi-old,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    4848
    49 $(PKG_BUILD_DIR)/.configured:
     49$(WRKBUILD)/.configured:
    5050        touch $@
    5151
    52 MADWIFI_OLD_MAKEOPTS= -C $(PKG_BUILD_DIR) \
     52MADWIFI_OLD_MAKEOPTS= -C $(WRKBUILD) \
    5353                PATH="$(TARGET_PATH)" \
    5454                ARCH="$(LINUX_KARCH)" \
     
    6161
    6262
    63 $(PKG_BUILD_DIR)/.built:
     63$(WRKBUILD)/.built:
    6464ifeq ($(findstring AHB,$(BUS)),AHB)
    6565        $(MAKE) $(MADWIFI_OLD_MAKEOPTS) BUS="AHB" all
     
    6969endif
    7070        $(MAKE) $(MADWIFI_OLD_MAKEOPTS) -C tools all
    71         $(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi
     71        $(RSTRIP) $(WRKBUILD)/tools/madwifi_multi
    7272        touch $@
    7373
     
    7878        install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI_OLD)/etc/init.d/S20madwifi
    7979        install -d -m0755 $(IDIR_KMOD_MADWIFI_OLD)/lib/modules/$(LINUX_VERSION)
    80         $(CP)   $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
    81                 $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
     80        $(CP)   $(WRKBUILD)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
     81                $(WRKBUILD)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
    8282                $(BUS_MODULES) \
    83                 $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
    84                 $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
     83                $(WRKBUILD)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
     84                $(WRKBUILD)/net80211/*.$(LINUX_KMOD_SUFFIX) \
    8585                $(IDIR_KMOD_MADWIFI_OLD)/lib/modules/$(LINUX_VERSION)/
    8686        install -d -m0755 $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin
    87         $(CP) $(PKG_BUILD_DIR)/tools/{80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats} $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin/
     87        $(CP) $(WRKBUILD)/tools/{80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats} $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin/
    8888        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI_OLD) $(PACKAGE_DIR)
    8989
    90 $(STAGING_DIR)/usr/include/madwifi-old/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built
     90$(STAGING_DIR)/usr/include/madwifi-old/net80211/ieee80211.h: $(WRKBUILD)/.built
    9191        mkdir -p $(STAGING_DIR)/usr/include/madwifi-old
    92         $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi-old
     92        $(CP) $(WRKBUILD)/include $(STAGING_DIR)/usr/include/madwifi-old
    9393        mkdir -p $(STAGING_DIR)/usr/include/madwifi-old/net80211
    94         $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi-old/net80211/
     94        $(CP) $(WRKBUILD)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi-old/net80211/
    9595        touch $@
    9696
Note: See TracChangeset for help on using the changeset viewer.