X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=package%2FMakefile;h=38b650c09a3becd64e404e52428f015dfdfde910;hp=9b400ffeff6f2dca9274a86566def756a2743fcf;hb=c6bc77ea365704f3f5c79d64aed069792a4e95b1;hpb=9882253827b16579bbd317f6e8c0deb75b0ca0f3 diff --git a/package/Makefile b/package/Makefile index 9b400ffeff..38b650c09a 100644 --- a/package/Makefile +++ b/package/Makefile @@ -17,23 +17,23 @@ $(curdir)/builddirs-install:=. $(sort $(package-y)) $(curdir)/install:=$(curdir)/install-cleanup $(curdir)/cleanup: $(TMP_DIR)/.build - rm -rf $(BUILD_DIR)/root + rm -rf $(TARGET_DIR) $(curdir)/rootfs-prepare: $(TMP_DIR)/.build @if [ -d $(TOPDIR)/files ]; then \ - $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ + $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \ fi - @mkdir -p $(BUILD_DIR)/root/etc/rc.d + @mkdir -p $(TARGET_DIR)/etc/rc.d @( \ - cd $(BUILD_DIR)/root; \ + cd $(TARGET_DIR); \ for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ - IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \ + IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \ done || true \ ) - @-find $(BUILD_DIR)/root -name CVS | $(XARGS) rm -rf - @-find $(BUILD_DIR)/root -name .svn | $(XARGS) rm -rf - @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f + @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf + @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf + @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f $(curdir)/index: FORCE @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)