fix compile error on squashfs-lzma patch

[openwrt.git] / target / linux / package / openwrt / Makefile

diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile
index 75053b1..6fa350a 100644 (file)
--- a/target/linux/package/openwrt/Makefile
+++ b/target/linux/package/openwrt/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME := base-files-arch
 PKG_RELEASE := 1
 
 PKG_NAME := base-files-arch
 PKG_RELEASE := 1

-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BOARD)
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 


@@ -21,7 +21,7 @@ $(PKG_BUILD_DIR)/jffs2root: jffs2root.c
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
 
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
 

-$(IDIR_OPENWRT)/sbin/jffs2root:
+$(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root

        mkdir -p $(IDIR_OPENWRT)/sbin
        cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin
 
        mkdir -p $(IDIR_OPENWRT)/sbin
        cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin
 


@@ -35,13 +35,16 @@ $(IDIR_OPENWRT):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_OPENWRT) ipkg/base-files-arch.control $(PKG_RELEASE) $(ARCH)
        $(SED) s,base-files-arch,base-files-$(BOARD),g $(IDIR_OPENWRT)/CONTROL/control
 
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_OPENWRT) ipkg/base-files-arch.control $(PKG_RELEASE) $(ARCH)
        $(SED) s,base-files-arch,base-files-$(BOARD),g $(IDIR_OPENWRT)/CONTROL/control
 

-$(IPKG_OPENWRT):
-       mkdir -p $(IDIR_OPENWRT)/etc
-       cp files/network.overrides.$(BOARD) $(IDIR_OPENWRT)/etc/network.overrides
+$(IPKG_OPENWRT): $(IDIR_OPENWRT)
+       [ -d files/$(BOARD) ] && cp -a files/$(BOARD)/* $(IDIR_OPENWRT)/
+       find $(IDIR_OPENWRT) -name CVS | xargs rm -rf
+       find $(IDIR_OPENWRT) -name .svn | xargs rm -rf

        $(RSTRIP) $(IDIR_OPENWRT)
        $(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_OPENWRT)
        $(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR)
 

-compile: install-dev
+install: compile
+       $(IPKG) install $(IPKG_OPENWRT)
+compile: install-dev $(IPKG_OPENWRT)

 install-dev:
        mkdir -p $(STAGING_DIR)/usr/include
        cp -a ./include/* $(STAGING_DIR)/usr/include/
 install-dev:
        mkdir -p $(STAGING_DIR)/usr/include
        cp -a ./include/* $(STAGING_DIR)/usr/include/