fix for madwifi radiotap support (patch by jwright)

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

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index ef91e28..43dd691 100644 (file)
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -16,11 +16,6 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 

-ifneq ($(BOARD),ar7)
-BR2_PACKAGE_LINUX_ATM:=m
-BR2_PACKAGE_BR2684CTL:=m
-endif
-

 $(eval $(call PKG_template,LINUX_ATM,linux-atm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,BR2684CTL,br2684ctl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call PKG_template,LINUX_ATM,linux-atm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,BR2684CTL,br2684ctl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 


@@ -61,23 +56,23 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LINUX_ATM): 
        install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib
 
 $(IPKG_LINUX_ATM): 
        install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib

-       cp $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib
+       cp -f $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib

        $(RSTRIP) $(IDIR_LINUX_ATM)/
        $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)
 
 $(IPKG_BR2684CTL): 
        install -d -m0755 $(IDIR_BR2684CTL)/usr/sbin
        $(RSTRIP) $(IDIR_LINUX_ATM)/
        $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)
 
 $(IPKG_BR2684CTL): 
        install -d -m0755 $(IDIR_BR2684CTL)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/
-       install -d -m0755 $(IDIR_BR2684CTL)/etc/init.d
-       install -m0755 ./files/br2684.init $(IDIR_BR2684CTL)/etc/init.d/S30br2684
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/
+       install -d -m0755 $(IDIR_BR2684CTL)/etc/hotplug.d/net
+       install -m0644 ./files/br2684.init $(IDIR_BR2684CTL)/etc/hotplug.d/net/30-br2684

        $(RSTRIP) $(IDIR_BR2684CTL)/
        $(IPKG_BUILD) $(IDIR_BR2684CTL) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libatm.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_BR2684CTL)/
        $(IPKG_BUILD) $(IDIR_BR2684CTL) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libatm.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/

        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libatm.so
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libatm.so


@@ -87,9 +82,8 @@ uninstall-dev:
                $(STAGING_DIR)/usr/include/atm{,d,sap}.h \
                $(STAGING_DIR)/usr/lib/libatm.{a,so*} \
 
                $(STAGING_DIR)/usr/include/atm{,d,sap}.h \
                $(STAGING_DIR)/usr/lib/libatm.{a,so*} \
 

-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev

 
 mostlyclean:
        $(MAKE) -C $(PKG_BUILD_DIR) clean
 
 mostlyclean:
        $(MAKE) -C $(PKG_BUILD_DIR) clean