X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5eca1169a020f0d082a08ff282375f2ae2915503..37840396d601a725bd29f264946f5a14dc7d21d0:/package/Makefile diff --git a/package/Makefile b/package/Makefile index d1605afe9..6ddbc1ba4 100644 --- a/package/Makefile +++ b/package/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/.config -include $(TOPDIR)/.pkgdeps +include $(TMP_DIR)/.pkgdeps include $(INCLUDE_DIR)/host.mk PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) @@ -41,20 +41,22 @@ 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 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) prereq: $(PREREQ_PACKAGES) download: $(DOWNLOAD_PACKAGES) -compile-targets: $(COMPILE_PACKAGES) -compile: - $(MAKE) compile-targets -install-targets: base-files-install $(INSTALL_PACKAGES) +compile: $(COMPILE_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 \ @@ -68,8 +70,10 @@ index: $(PACKAGE_DIR)/Packages $(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) +symlinks: + ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) -ifeq ($(MAKECMDGOALS),compile-targets) +ifeq ($(MAKECMDGOALS),compile) MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) else .NOTPARALLEL: