X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/faff9f480dbb6927e0f0c0c6f762647be35137e7..34ef6fcb4c61ecd1d35c73dc8e240e8d1e3028e9:/package/cups/Makefile

diff --git a/package/cups/Makefile b/package/cups/Makefile
index 5c5c3e2e4..8ffa8665f 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -71,21 +71,24 @@ $(PKG_BUILD_DIR)/.built:
 	touch $@
 
 $(IPKG_CUPS):
+	rm -rf $(IDIR_CUPS)/etc/cups
 	install -d -m0755 $(IDIR_CUPS)/etc/cups
 	cp -fpR $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/
+	rm -rf $(IDIR_CUPS)/etc/cups/certs
+	ln -sf /tmp $(IDIR_CUPS)/etc/cups/certs
 	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 +100,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
 
@@ -111,6 +114,6 @@ uninstall-dev:
 	  $(STAGING_DIR)/usr/include/cups \
 	  $(STAGING_DIR)/usr/lib/libcups.{a,so*}
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev