cups: Add link at /etc/cups pointing to configuration

This is needed because cups-pdf is looking for its configuration file in
/etc/cups.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 18987be0e4081175e8ecc3ffba31f581cafb4502..65ad4f418a84d57871876bdd27fd6b485e5e8009 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,3 +1,4 @@
+etc/cups
 etc/dbus-1/system.d/cups.conf
 etc/pam.d/cups
 etc/rc.d/init.d/cups

diff --git a/lfs/cups b/lfs/cups
index d333532e3acac0eaa6cee1a334a4364087e588ad..312f165d8fa6ceff5993ac6f6f0447153e3aba8b 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 27
+PAK_VER    = 28
 
 DEPS       = avahi cups-filters dbus ghostscript
 
@@ -104,5 +104,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        $(call INSTALL_INITSCRIPTS,$(SERVICES))
        cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
 
+       # Install convenience link
+       ln -svf /var/ipfire/cups /etc/cups
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)