X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2FMakefile;h=d21fedf31becb42d4de8d2fedc3a54b54188554d;hb=7656ad75e5320ce90c09193942447e38d317367f;hp=d1605afe9f9fd1d23c0eaf3f77bb503ec1f836d0;hpb=8612d336918b408fd3abd844ccb8189f0d64acc5;p=lede-git%2F.git diff --git a/package/Makefile b/package/Makefile index d1605afe9f..d21fedf31b 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,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 @@ -50,11 +50,16 @@ prereq: $(PREREQ_PACKAGES) download: $(DOWNLOAD_PACKAGES) compile-targets: $(COMPILE_PACKAGES) compile: + @-rm -f $(PACKAGE_DIR)/*.ipk $(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 \ @@ -68,6 +73,8 @@ 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) MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)