Merge 2.4 patches to 2.6 kernel.

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

diff --git a/openwrt/package/atftp/Makefile b/openwrt/package/atftp/Makefile
index 3acd841..f49aab6 100644 (file)
--- a/openwrt/package/atftp/Makefile
+++ b/openwrt/package/atftp/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured: 
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
@@ -53,18 +53,19 @@ $(PKG_BUILD_DIR)/.built:
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) -Wall -D_REENTRANT" \
                DESTDIR=$(PKG_INSTALL_DIR) \
                all install
        touch $@
 
 $(IPKG_ATFTP):
        install -d -m0755 $(IDIR_ATFTP)/usr/bin
-       cp -fpR $(PKG_BUILD_DIR)/atftp $(IDIR_ATFTP)/usr/bin
+       $(CP) $(PKG_BUILD_DIR)/atftp $(IDIR_ATFTP)/usr/bin
        $(RSTRIP) $(IDIR_ATFTP)
        $(IPKG_BUILD) $(IDIR_ATFTP) $(PACKAGE_DIR)
 
 $(IPKG_ATFTPD):
        install -d -m0755 $(IDIR_ATFTPD)/usr/sbin
-       cp -fpR $(PKG_BUILD_DIR)/atftpd $(IDIR_ATFTPD)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/atftpd $(IDIR_ATFTPD)/usr/sbin
        $(RSTRIP) $(IDIR_ATFTPD)
        $(IPKG_BUILD) $(IDIR_ATFTPD) $(PACKAGE_DIR)