X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..e1bdcce850872c403681a219bdcf3049704c1aad:/package/Makefile diff --git a/package/Makefile b/package/Makefile index e94c181ba..eafd8cbe6 100644 --- a/package/Makefile +++ b/package/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/.config -include $(TOPDIR)/.pkgdeps -include $(TOPDIR)/host.mk +include $(TMP_DIR)/.pkgdeps +include $(INCLUDE_DIR)/host.mk PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) @@ -41,7 +41,7 @@ ifeq ($(SDK),1) GENDEP_OPTS := -s endif -$(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo +$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@ all: compile @@ -51,10 +51,20 @@ download: $(DOWNLOAD_PACKAGES) compile-targets: $(COMPILE_PACKAGES) compile: $(MAKE) compile-targets -install-targets: base-files-install $(INSTALL_PACKAGES) +install-targets: $(INSTALL_PACKAGES) install: rm -rf $(BUILD_DIR)/root $(MAKE) install-targets + @if [ -d $(TOPDIR)/files ]; then \ + $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ + fi + @( \ + cd $(BUILD_DIR)/root; \ + 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; \ + done; \ + ) index: $(PACKAGE_DIR)/Packages