aboutsummaryrefslogtreecommitdiffstats
path: root/package/Makefile
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-08-07 00:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-08-07 00:04:25 +0000
commitd10a56dc58f6c601a9abaddbe1e9cfe4db97d57b (patch)
tree9cda5ecf22a01d8a2ac22cd1a6510d51dfd5f3c3 /package/Makefile
parenta46bd6cee4e494a5879393349c2a6990996c5904 (diff)
downloadmaster-187ad058-d10a56dc58f6c601a9abaddbe1e9cfe4db97d57b.tar.gz
master-187ad058-d10a56dc58f6c601a9abaddbe1e9cfe4db97d57b.tar.bz2
master-187ad058-d10a56dc58f6c601a9abaddbe1e9cfe4db97d57b.zip
build system cleanup/restructuring as described in http://lists.openwrt.org/pipermail/openwrt-devel/2007-August/001159.html
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8362 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/Makefile')
-rw-r--r--package/Makefile16
1 files changed, 8 insertions, 8 deletions
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)