use gcc 4.0.2 and deselect ppp by default for Aruba, use gcc 3.4.5 for the other...

[openwrt.git] / package / collectd / Makefile

diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 5d7bc34..e757f96 100644 (file)
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -93,9 +93,9 @@ $(IPKG_COLLECTD):
        install -d -m0755 $(IDIR_COLLECTD)/usr/lib/collectd
        install -d -m0755 $(IDIR_COLLECTD)/var/lib/collectd
        install -d -m0755 $(IDIR_COLLECTD)/var/run
        install -d -m0755 $(IDIR_COLLECTD)/usr/lib/collectd
        install -d -m0755 $(IDIR_COLLECTD)/var/lib/collectd
        install -d -m0755 $(IDIR_COLLECTD)/var/run

-       cp -fpR ./files/S80collectd $(IDIR_COLLECTD)/etc/init.d/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/collectd $(IDIR_COLLECTD)/usr/sbin/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(IDIR_COLLECTD)/usr/lib/collectd/
+       $(CP) ./files/S80collectd $(IDIR_COLLECTD)/etc/init.d/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(IDIR_COLLECTD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(IDIR_COLLECTD)/usr/lib/collectd/

        $(RSTRIP) $(IDIR_COLLECTD)
        $(IPKG_BUILD) $(IDIR_COLLECTD) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_COLLECTD)
        $(IPKG_BUILD) $(IDIR_COLLECTD) $(PACKAGE_DIR)