sync with the non-ramdisk config

[openwrt.git] / openwrt / package / amwall / Makefile

diff --git a/openwrt/package/amwall/Makefile b/openwrt/package/amwall/Makefile
index 173a5d4..a2e3c39 100644 (file)
--- a/openwrt/package/amwall/Makefile
+++ b/openwrt/package/amwall/Makefile
@@ -18,11 +18,15 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,AMWALL,amwall,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,AMWALL,amwall,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
+       touch $@
+
+$(PKG_BUILD_DIR)/.built:

        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

+               V= \

                LDIR=$(PKG_BUILD_DIR) \
                AMSEL_INCLUDE="$(STAGING_DIR)/usr/include" \
                OPT_LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                LDIR=$(PKG_BUILD_DIR) \
                AMSEL_INCLUDE="$(STAGING_DIR)/usr/include" \
                OPT_LDFLAGS="-L$(STAGING_DIR)/usr/lib" \


@@ -34,11 +38,11 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
 
 $(IPKG_AMWALL):
        install -d -m0755 $(IDIR_AMWALL)/usr/bin
 
 $(IPKG_AMWALL):
        install -d -m0755 $(IDIR_AMWALL)/usr/bin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_AMWALL)/usr/bin     
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_AMWALL)/usr/bin       

        install -d -m0755 $(IDIR_AMWALL)/usr/sbin
        install -d -m0755 $(IDIR_AMWALL)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_AMWALL)/usr/sbin   
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_AMWALL)/usr/sbin     

        install -d -m0755 $(IDIR_AMWALL)/etc/amsel
        install -d -m0755 $(IDIR_AMWALL)/etc/amsel

-       cp -fpR $(PKG_INSTALL_DIR)/etc/amsel* $(IDIR_AMWALL)/etc        
+       $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(IDIR_AMWALL)/etc  

        $(RSTRIP) $(IDIR_AMWALL)                                        
        $(IPKG_BUILD) $(IDIR_AMWALL) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_AMWALL)                                        
        $(IPKG_BUILD) $(IDIR_AMWALL) $(PACKAGE_DIR)