rt2800pci: add back ifdown hang workaround that was accidentally dropped during a...

[openwrt.git] / package / linux-atm / Makefile

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 3321425..4b12af9 100644 (file)
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -1,11 +1,12 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=linux-atm
 PKG_VERSION:=2.5.1
 
 PKG_NAME:=linux-atm
 PKG_VERSION:=2.5.1


@@ -15,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=9560b0e1f410a05b849dfdab465dd758
 
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=9560b0e1f410a05b849dfdab465dd758
 

+PKG_INSTALL:=1
+

 include $(INCLUDE_DIR)/package.mk
 
 define Package/linux-atm
 include $(INCLUDE_DIR)/package.mk
 
 define Package/linux-atm


@@ -40,42 +43,38 @@ define Package/atm-tools/description
   This package contains the Linux ATM tools.
 endef
 
   This package contains the Linux ATM tools.
 endef
 

-define Build/Prepare
-       $(call Build/Prepare/Default)
-       $(INSTALL_BIN) $(SCRIPT_DIR)/config.sub $(SCRIPT_DIR)/config.guess $(PKG_BUILD_DIR)/
-endef
-

 define Build/Configure
        $(call Build/Configure/Default)
        # prevent autoheader invocation
        touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
 
 define Build/Configure
        $(call Build/Configure/Default)
        # prevent autoheader invocation
        touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
 

+TARGET_CFLAGS += -I$(LINUX_DIR)/include -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include
+

 define Build/Compile
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+       # src/qgen is built with HOSTCC, which does not really like our LDFLAGS
+       $(MAKE) -C $(PKG_BUILD_DIR)/src/qgen \
+               LDFLAGS="" \
+               all
+       $(MAKE) -C $(PKG_BUILD_DIR) all

 endef
 
 endef
 

-ifneq ($(CONFIG_PACKAGE_linux-atm),)
-  define Build/InstallDev
-       mkdir -p $(1)/usr/include
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h \
-               $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \
-               $(1)/usr/lib/
-  endef
-endif
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include \
+               $(PKG_INSTALL_DIR)/usr/lib \
+               $(1)/usr/
+endef

 
 define Package/linux-atm/install
        $(INSTALL_DIR) $(1)/usr/lib
 
 define Package/linux-atm/install
        $(INSTALL_DIR) $(1)/usr/lib

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so* $(1)/usr/lib/

 endef
 
 define Package/atm-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin/
 endef
 
 define Package/atm-tools/install
        $(INSTALL_DIR) $(1)/usr/sbin/

-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmarp{,d} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/arpd/atmarp{,d} $(1)/usr/sbin/

        $(INSTALL_DIR) $(1)/lib/network
        $(INSTALL_BIN) ./files/ipoa.sh $(1)/lib/network/
        $(INSTALL_DIR) $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/lib/network
        $(INSTALL_BIN) ./files/ipoa.sh $(1)/lib/network/
        $(INSTALL_DIR) $(1)/usr/bin/