From db5f46bc995b0bc6dce678d0a39b6287ac3c4d35 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 8 Jun 2005 19:37:48 +0000 Subject: Always use -R flag with cp (to preserve symlinks) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1172 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/cups/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/cups/Makefile') diff --git a/package/cups/Makefile b/package/cups/Makefile index 5c5c3e2e4..ef921ed88 100644 --- a/package/cups/Makefile +++ b/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 -- cgit v1.2.3