X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flinux-atm%2FMakefile;h=4edd362710821916e35191a0ddabd213de005b42;hb=704ec3531351d45a54ddb8a74b7d13476e54f477;hp=0b8c59d4e157d22f54114f03bc2fbafb39914ab0;hpb=02cdebbb91a33d8e24da1c94a9d93ac39be168a7;p=openwrt-10.03%2F.git

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 0b8c59d4e..4edd36271 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -11,58 +11,40 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=linux-atm
 PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=84fef49cc39ff2605204246666f65864
 
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
+PKG_MD5SUM:=84fef49cc39ff2605204246666f65864
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/linux-atm
-SECTION:=libs
-CATEGORY:=Libraries
-TITLE:=Linux ATM Library
-DESCRIPTION:=Library for accessing the Linux ATM subsystem
+define Package/linux-atm/Default
+  URL:=http://linux-atm.sourceforge.net/
 endef
 
-define Package/br2684ctl
-SECTION:=net
-CATEGORY:=Network
-TITLE:=RFC2684 bridging
-DEPENDS:=+linux-atm
-DESCRIPTION:=ATM RFC2684 bridging utility
+define Package/linux-atm
+  $(call Package/linux-atm/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Linux ATM Library
+  DESCRIPTION:=\
+	This package contains a library for accessing the Linux ATM subsystem.
 endef
 
 define Build/Configure
-	$(call Build/Configure/Default,)
+	$(call Build/Configure/Default)
 	# prevent autoheader invocation
 	touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
 
+TARGET_CFLAGS := -I$(PKG_BUILD_DIR)/src/include $(TARGET_CFLAGS)
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/linux-atm/install
-	install -d -m0755 $(1)/usr/lib
-	cp -f $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(1)/usr/lib
-endef
-
-define Package/br2684ctl/install
-	install -d -m0755 $(1)/etc/hotplug.d/net
-	install -m0644 ./files/br2684.hotplug $(1)/etc/hotplug.d/net/30-br2684
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(1)/usr/sbin/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP)	$(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h \
@@ -77,5 +59,13 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libatm.{a,so*}
 endef
 
+define Package/linux-atm/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	cp -f $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(1)/usr/lib
+endef
+
 $(eval $(call BuildPackage,linux-atm))
-$(eval $(call BuildPackage,br2684ctl))
+
+$(eval $(call RequireCommand,automake, \
+	$(PKG_NAME) requires automake. \
+))