Fix autotools with the arpd directory

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

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 9aae0a0..ecadb3d 100644 (file)
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -15,34 +15,30 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=84fef49cc39ff2605204246666f65864
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=84fef49cc39ff2605204246666f65864

-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-define Package/linux-atm/Default
-  URL:=http://linux-atm.sourceforge.net/
-endef
-

 define Package/linux-atm
 define Package/linux-atm

-  $(call Package/linux-atm/Default)

   SECTION:=libs
   CATEGORY:=Libraries
   SECTION:=libs
   CATEGORY:=Libraries

-  TITLE:=Linux ATM Library
-  DESCRIPTION:=\
-       This package contains a library for accessing the Linux ATM subsystem.
+  TITLE:=Linux ATM library
+  URL:=http://linux-atm.sourceforge.net/

 endef
 
 endef
 

-define Package/br2684ctl
-  $(call Package/linux-atm/Default)
+define Package/linux-atm/description
+  This package contains a library for accessing the Linux ATM subsystem.
+endef
+
+define Package/atm-tools

   SECTION:=net
   CATEGORY:=Network
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=+linux-atm
-  TITLE:=RFC2684 bridging utility
-  DESCRIPTION:=\
-       This package contains an ATM RFC2684 bridging utility.
+  DEPENDS:=linux-atm
+  TITLE:=Linux ATM tools
+  URL:=http://linux-atm.sourceforge.net/
+endef
+
+define Package/atm-tools/description
+  This package contains the Linux ATM tools.

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure


@@ -51,11 +47,12 @@ define Build/Configure
        touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
 
        touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
 

+TARGET_CFLAGS := -I$(PKG_BUILD_DIR)/src/include $(TARGET_CFLAGS)

 define Build/Compile
 define Build/Compile

-       $(call Build/Compile/Default, \
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               all install \
-       )
+               all install

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -77,16 +74,12 @@ define Package/linux-atm/install
        cp -f $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(1)/usr/lib
 endef
 
        cp -f $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(1)/usr/lib
 endef
 

-define Package/br2684ctl/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/net
-       $(INSTALL_DATA) ./files/br2684.hotplug $(1)/etc/hotplug.d/net/30-br2684
+define Package/atm-tools/install
+       $(INSTALL_DIR) $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/atmarp{,d} $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/lib/network
+       $(INSTALL_BIN) ./files/ipoa.sh $(1)/lib/network/

 endef
 
 $(eval $(call BuildPackage,linux-atm))
 endef
 
 $(eval $(call BuildPackage,linux-atm))

-$(eval $(call BuildPackage,br2684ctl))
-
-$(eval $(call RequireCommand,automake, \
-       $(PKG_NAME) requires automake. \
-))
+$(eval $(call BuildPackage,atm-tools))