large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

[openwrt.git] / target / linux / package / base-files / Makefile

diff --git a/target/linux/package/base-files/Makefile b/target/linux/package/base-files/Makefile
index 994ce53..cf72eab 100644 (file)
--- a/target/linux/package/base-files/Makefile
+++ b/target/linux/package/base-files/Makefile
@@ -15,15 +15,28 @@ $(PKG_BUILD_DIR)/.prepared:
        mkdir -p $(PKG_BUILD_DIR)
        touch $@
 
        mkdir -p $(PKG_BUILD_DIR)
        touch $@
 

+ifeq ($(BOARD),ar7)
+$(PKG_BUILD_DIR)/adam2patcher: src/adam2patcher.c
+       $(TARGET_CC) -o $@ $<
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/adam2patcher
+
+$(IDIR_OPENWRT)/sbin/adam2patcher: $(PKG_BUILD_DIR)/adam2patcher
+       mkdir -p $(IDIR_OPENWRT)/sbin
+       $(CP) $(PKG_BUILD_DIR)/adam2patcher $(IDIR_OPENWRT)/sbin
+
+$(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/adam2patcher
+endif
+

 ifeq ($(BOARD),brcm)
 ifeq ($(BOARD),brcm)

-$(PKG_BUILD_DIR)/jffs2root: jffs2root.c
+$(PKG_BUILD_DIR)/jffs2root: src/jffs2root.c

        $(TARGET_CC) -o $@ $<
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
 
 $(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root
        mkdir -p $(IDIR_OPENWRT)/sbin
        $(TARGET_CC) -o $@ $<
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
 
 $(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root
        mkdir -p $(IDIR_OPENWRT)/sbin

-       cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin
+       $(CP) $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin

 
 $(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/jffs2root
 endif
 
 $(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/jffs2root
 endif


@@ -36,7 +49,7 @@ $(IDIR_OPENWRT):
        $(SED) s,base-files-arch,base-files-$(BOARD)-$(KERNEL),g $(IDIR_OPENWRT)/CONTROL/control
 
 $(IPKG_OPENWRT): $(IDIR_OPENWRT)
        $(SED) s,base-files-arch,base-files-$(BOARD)-$(KERNEL),g $(IDIR_OPENWRT)/CONTROL/control
 
 $(IPKG_OPENWRT): $(IDIR_OPENWRT)

-       [ -d files/$(BOARD)-$(KERNEL) ] && cp -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/
+       [ -d files/$(BOARD)-$(KERNEL) ] && $(CP) -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/

        find $(IDIR_OPENWRT) -name CVS | xargs rm -rf
        find $(IDIR_OPENWRT) -name .svn | xargs rm -rf
        $(RSTRIP) $(IDIR_OPENWRT)
        find $(IDIR_OPENWRT) -name CVS | xargs rm -rf
        find $(IDIR_OPENWRT) -name .svn | xargs rm -rf
        $(RSTRIP) $(IDIR_OPENWRT)


@@ -50,4 +63,4 @@ openwrt-install:
 compile-targets: install-dev $(IPKG_OPENWRT)
 install-dev:
        mkdir -p $(STAGING_DIR)/usr/include
 compile-targets: install-dev $(IPKG_OPENWRT)
 install-dev:
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR ./include/[a-z]* $(STAGING_DIR)/usr/include/
+       $(CP) ./include/[a-z]* $(STAGING_DIR)/usr/include/