Changeset 330

Show
Ignore:
Timestamp:
07/21/06 22:24:14 (2 years ago)
Author:
tg
Message:

fix some more fallout (there's more to come,
I only built mini_fo and fuse)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/target/linux/package/fuse/Makefile

    r323 r330  
    5757 
    5858$(WRKBUILD)/.built: 
    59         mkdir -p $(PKG_INSTALL_DIR) 
     59        mkdir -p $(WRKINST) 
    6060        $(MAKE) -C $(WRKBUILD) \ 
    6161                ARCH="$(LINUX_KARCH)" \ 
    6262                CROSS_COMPILE="$(TARGET_CROSS)" \ 
    6363                PATH="$(TARGET_PATH)" \ 
    64                 DESTDIR="$(PKG_INSTALL_DIR)" \ 
     64                DESTDIR="$(WRKINST)" \ 
    6565                SUBDIRS="kernel" \ 
    6666                all install 
    …… 
    6969$(IPKG_KMOD_FUSE): 
    7070        mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) 
    71         $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ 
     71        $(CP) $(WRKINST)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ 
    7272                $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ 
    7373        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) 

  • trunk/freewrt/target/linux/package/hostap/Makefile

    r323 r330  
    1414 
    1515WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    16 PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install 
     16WRKINST:=$(WRKBUILD)/ipkg-install 
    1717 
    1818include $(TOPDIR)/package/rules.mk 

  • trunk/freewrt/target/linux/package/mini_fo/Makefile

    r323 r330  
    1 include $(TOPDIR)/rules.mk 
    2 include ../../rules.mk 
    3  
    41PKG_NAME := mini_fo 
    52PKG_VERSION := 0.6.2pre1 
    …… 
    107PKG_SOURCE := mini_fo-0-6-2-pre1.tar.bz2 
    118 
    12 WRKBUILD := $(BUILD_DIR)/mini_fo-0-6-2-pre1 
    13 PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install 
     9WRKSRC=                 ${WRKDIR}/mini_fo-0-6-2-pre1 
    1410 
     11include $(TOPDIR)/rules.mk 
     12include ../../rules.mk 
    1513include $(TOPDIR)/package/rules.mk 
    1614 
    …… 
    2119        touch $@ 
    2220 
    23 $(WRKBUILD)/.built:  
     21$(WRKBUILD)/.built: 
    2422        $(MAKE) -C $(WRKBUILD) \ 
    2523                PATH="$(TARGET_PATH)" \ 
    …… 
    3836        echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo 
    3937        $(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR) 
    40  

  • trunk/freewrt/target/linux/package/shfs/Makefile

    r323 r330  
    1414 
    1515WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    16 PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install 
     16WRKINST:=$(WRKBUILD)/ipkg-install 
    1717 
    1818include $(TOPDIR)/package/rules.mk 
    …… 
    2424 
    2525$(WRKBUILD)/.built:  
    26         rm -rf $(PKG_INSTALL_DIR) 
    27         mkdir -p $(PKG_INSTALL_DIR) 
     26        rm -rf $(WRKINST) 
     27        mkdir -p $(WRKINST) 
    2828        $(MAKE) -C $(WRKBUILD) \ 
    2929                ARCH="$(LINUX_KARCH)" \ 
    …… 
    3535                KERNEL="$(LINUX_VERSION)" \ 
    3636                KERNEL_SOURCES="$(LINUX_DIR)" \ 
    37                 ROOT="$(PKG_INSTALL_DIR)" \ 
     37                ROOT="$(WRKINST)" \ 
    3838                module module-install 
    3939        touch $@ 
    …… 
    4141$(IPKG_KMOD_SHFS): 
    4242        install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION) 
    43         $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ 
     43        $(CP) $(WRKINST)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ 
    4444         $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/ 
    4545        $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR) 

  • trunk/freewrt/target/linux/package/spca5xx/Makefile

    r323 r330  
    1414 
    1515WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    16 PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install 
     16WRKINST:=$(WRKBUILD)/ipkg-install 
    1717 
    1818include $(TOPDIR)/package/rules.mk 

  • trunk/freewrt/target/linux/package/ueagle-atm/Makefile

    r323 r330  
    1414 
    1515WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    16 PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install 
     16WRKINST:=$(WRKBUILD)/ipkg-install 
    1717 
    1818include $(TOPDIR)/package/rules.mk 

  • trunk/freewrt/target/linux/package/zd1211/Makefile

    r323 r330  
    1414 
    1515WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION) 
    16 PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install 
     16WRKINST:=$(WRKBUILD)/ipkg-install 
    1717 
    1818include $(TOPDIR)/package/rules.mk