- up to 1.3.9

[packages/cups.git] / cups-certs_FHS.patch

--- cups-1.2.7/config-scripts/cups-directories.m4.orig	2006-08-29 22:48:59.000000000 +0200
+++ cups-1.2.7/config-scripts/cups-directories.m4	2006-12-18 03:28:33.624756362 +0100
@@ -311,8 +311,14 @@
 AC_SUBST(CUPS_SERVERROOT)
 
 # Transient run-time state
-CUPS_STATEDIR="$localstatedir/run/cups"
-AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
+AC_ARG_WITH(logdir, [  --with-statedir           set path for certs state],statedir="$withval",statedir="")
+
+if test x$logdir = x; then
+	CUPS_STATEDIR="$localstatedir/lib/cups"
+else
+	CUPS_STATEDIR="$statedir"
+fi
+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl
--- cups-1.2.7/config-scripts/cups-network.m4.orig	2006-10-20 17:07:21.000000000 +0200
+++ cups-1.2.7/config-scripts/cups-network.m4	2006-12-18 03:30:16.608100516 +0100
@@ -72,7 +72,7 @@
 				;;
 			*)
 				# All others use FHS standard...
-				CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock"
+				CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cups/cups.sock"
 				;;
 		esac
 	else