fix uci_load trash output (#1040)

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index d1605af..34eba4e 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -8,7 +8,7 @@
 
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config
 
 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))
 include $(INCLUDE_DIR)/host.mk
 
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))


@@ -41,7 +41,7 @@ ifeq ($(SDK),1)
 GENDEP_OPTS := -s
 endif
 
 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
        @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
 
 all: compile


@@ -55,6 +55,9 @@ install-targets: base-files-install $(INSTALL_PACKAGES)
 install:
        rm -rf $(BUILD_DIR)/root
        $(MAKE) install-targets
 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 \
        @( \
                cd $(BUILD_DIR)/root; \
                for script in ./etc/init.d/*; do \