From 653b2366eaf82cd51e6912927a8ec7fc9edd3e14 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 8 Jun 2005 19:37:48 +0000
Subject: [PATCH] Always use -R flag with cp (to preserve symlinks)

SVN-Revision: 1172
---
 openwrt/package/cups/Makefile         | 14 +++++++-------
 openwrt/package/gmp/Makefile          |  6 +++---
 openwrt/package/libffi-sable/Makefile |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/openwrt/package/cups/Makefile b/openwrt/package/cups/Makefile
index 5c5c3e2e4e..ef921ed88a 100644
--- a/openwrt/package/cups/Makefile
+++ b/openwrt/package/cups/Makefile
@@ -74,18 +74,18 @@ $(IPKG_CUPS):
 	install -d -m0755 $(IDIR_CUPS)/etc/cups
 	cp -fpR $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/
 	install -d -m0755 $(IDIR_CUPS)/usr/bin
-	cp -fp $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/
 	rm -f $(IDIR_CUPS)/usr/bin/cups-config
 	install -d -m0755 $(IDIR_CUPS)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/cups $(IDIR_CUPS)/usr/lib/
 	install -d -m0755 $(IDIR_CUPS)/usr/share/cups/templates
-	cp -fp $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/
 	install -d -m0755 $(IDIR_CUPS)/usr/share/doc/cups
-	cp -fp $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/
 	cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/
 	install -d -m0755 $(IDIR_CUPS)/usr/sbin
-	cp -fp $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/
 	# overwrite default config with our own
 	cp -fpR ./files/etc/cups/* $(IDIR_CUPS)/etc/cups/
 	# install initscript with priority 60
@@ -97,11 +97,11 @@ $(IPKG_CUPS):
 
 $(STAGING_DIR)/usr/lib/libcups.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/bin
-	cp -fp $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/
 	mkdir -p $(STAGING_DIR)/usr/include
 	cp -fpR $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/
 
 install-dev: $(STAGING_DIR)/usr/lib/libcups.so
 
diff --git a/openwrt/package/gmp/Makefile b/openwrt/package/gmp/Makefile
index 4cd0310e46..840f57c238 100644
--- a/openwrt/package/gmp/Makefile
+++ b/openwrt/package/gmp/Makefile
@@ -60,15 +60,15 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 
 $(IPKG_LIBGMP):
 	install -m0755 -d $(IDIR_LIBGMP)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(IDIR_LIBGMP)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(IDIR_LIBGMP)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBGMP)
 	$(IPKG_BUILD) $(IDIR_LIBGMP) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fp $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/
 	mkdir -p $(I_LIBPCAP_DEV)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libgmp.so
diff --git a/openwrt/package/libffi-sable/Makefile b/openwrt/package/libffi-sable/Makefile
index a8b8ac7033..8b9a368f91 100644
--- a/openwrt/package/libffi-sable/Makefile
+++ b/openwrt/package/libffi-sable/Makefile
@@ -62,15 +62,15 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBFFI_SABLE):
 	install -m0755 -d $(IDIR_LIBFFI_SABLE)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(IDIR_LIBFFI_SABLE)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(IDIR_LIBFFI_SABLE)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBFFI_SABLE)
 	$(IPKG_BUILD) $(IDIR_LIBFFI_SABLE) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libffi.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fp $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libffi.so