X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/31510cc4721afbff51e52541a23170f53e01ed4c..690bcb591b77cfb075d3ca8187885b31add306cf:/package/linux-atm/Makefile

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 9bf6b02de..0e469c7a7 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linux-atm
-PKG_VERSION:=2.4.1
+PKG_VERSION:=2.5.1
 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_MD5SUM:=9560b0e1f410a05b849dfdab465dd758
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -21,7 +21,6 @@ define Package/linux-atm
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Linux ATM library
-  DEPENDS:=+kmod-atm
   URL:=http://linux-atm.sourceforge.net/
 endef
 
@@ -47,7 +46,10 @@ define Build/Prepare
 endef
 
 define Build/Configure
-	$(call Build/Configure/Default)
+	(cd $(PKG_BUILD_DIR); \
+		./configure \
+	)
+	#$(call Build/Configure/Default)
 	# prevent autoheader invocation
 	touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
@@ -61,24 +63,54 @@ endef
 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
-	$(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
-	$(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/
-	$(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/
+
+#
+#The following is disabled by default but still useful for some debugging
+#
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmaddr $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmloop $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmtcp     $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/esi $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aread $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/awrite $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmdiag $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmdump $(1)/usr/bin/
+#
+# The following is really for some specific application, and obsolete for most of it
+#
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmsigd $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bus $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ilmid $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ilmidiag $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lecs $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/les $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mpcd $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zeppelin $(1)/usr/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmswitch $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/saaldump $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sonetdiag $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/svc_recv $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/svc_send $(1)/usr/bin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ttcp_atm $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,linux-atm))