summaryrefslogtreecommitdiffstats
path: root/package/linux-atm
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-01 23:53:19 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-01 23:53:19 +0000
commit82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 (patch)
treee4befa0d3bc81d1997e84c21273ee358620f6be0 /package/linux-atm
parent30ee8b09baf1f268b73e201f5c35f54e1ba6dfb9 (diff)
change cp to $(CP)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/linux-atm')
-rw-r--r--package/linux-atm/Makefile8
-rw-r--r--package/linux-atm/patches/300-no_autotools.patch2
2 files changed, 5 insertions, 5 deletions
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 3c7bf9c5b..93da3afcd 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -56,13 +56,13 @@ $(PKG_BUILD_DIR)/.built:
$(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) $(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
- cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/
+ $(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)/
@@ -70,9 +70,9 @@ $(IPKG_BR2684CTL):
$(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
- 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
diff --git a/package/linux-atm/patches/300-no_autotools.patch b/package/linux-atm/patches/300-no_autotools.patch
index 57f8ecb89..a085eca7d 100644
--- a/package/linux-atm/patches/300-no_autotools.patch
+++ b/package/linux-atm/patches/300-no_autotools.patch
@@ -836,7 +836,7 @@ diff -urN linux-atm.old/aclocal.m4 linux-atm.dev/aclocal.m4
-# serial 46 AC_PROG_LIBTOOL
+# serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
++# Debian $Rev$
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)