merge the control file and the .ipk file targets into one to prevent them from going...

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

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index ecadb3d..330f56b 100644 (file)
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 


@@ -41,42 +40,42 @@ 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$(PKG_BUILD_DIR)/src/include $(TARGET_CFLAGS)

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               $(TARGET_CONFIGURE_OPTS) \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 

-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/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_INSTALL_DIR)/usr/include/atm{,d,sap}.h \

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

        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \

-               $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/atm{,d,sap}.h \
-               $(STAGING_DIR)/usr/lib/libatm.{a,so*}
-endef
+               $(1)/usr/lib/
+  endef
+endif

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

-       cp -f $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(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/

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

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