package/iptables: refresh patches

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

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 3321425..38e9034 100644 (file)
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -40,11 +40,6 @@ 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
 define Build/Configure
        $(call Build/Configure/Default)
        # prevent autoheader invocation


@@ -52,6 +47,10 @@ define Build/Configure
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

+       # 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) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install


@@ -60,22 +59,22 @@ endef
 ifneq ($(CONFIG_PACKAGE_linux-atm),)
   define Build/InstallDev
        mkdir -p $(1)/usr/include
 ifneq ($(CONFIG_PACKAGE_linux-atm),)
   define Build/InstallDev
        mkdir -p $(1)/usr/include

-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h \
+       $(CP)   $(PKG_BUILD_DIR)/src/include/atm{,d,sap}.h \

                $(1)/usr/include/
        mkdir -p $(1)/usr/lib
                $(1)/usr/include/
        mkdir -p $(1)/usr/lib

-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \
+       $(CP)   $(PKG_BUILD_DIR)/src/lib/.libs/libatm.{a,so*} \

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

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so.* $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/src/lib/.libs/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/