Add amd64 detection when build host is a x86_64 machine, closes #390

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

diff --git a/openwrt/package/mtr/Makefile b/openwrt/package/mtr/Makefile
index d911716..f088562 100644 (file)
--- a/openwrt/package/mtr/Makefile
+++ b/openwrt/package/mtr/Makefile
@@ -1,3 +1,5 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtr
@@ -5,8 +7,8 @@ PKG_VERSION:=0.69
 PKG_RELEASE:=1
 PKG_MD5SUM:=58904d6d8d70114195cdeb653d56914c
 
-PKG_SOURCE_URL:=ftp://ftp.de.debian.org/debian/pool/main/m/mtr
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -15,8 +17,15 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,MTR,mtr,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       (cd $(PKG_BUILD_DIR); \
+$(PKG_BUILD_DIR)/.configured:
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+               touch configure.in; \
+               touch aclocal.m4; \
+               touch Makefile.in; \
+               touch img/Makefile.in; \
+               touch stamp-h.in; \
+               touch config.h.in; \
+               touch configure; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@@ -59,7 +68,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_MTR):
        install -d -m0755 $(IDIR_MTR)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/
        $(RSTRIP) $(IDIR_MTR)
        $(IPKG_BUILD) $(IDIR_MTR) $(PACKAGE_DIR)