- up to 1.7.5

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

diff --git a/cups-certs_FHS.patch b/cups-certs_FHS.patch
index 1d6f11fc44cf6dfb59471db2ac3b6bb1f983aaa3..b5ced37b4f217e0e2ffc9ebae88be428755811c5 100644 (file)
--- a/cups-certs_FHS.patch
+++ b/cups-certs_FHS.patch
@@ -1,22 +1,19 @@
 --- 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")
+@@ -421,6 +421,13 @@
+                       CUPS_STATEDIR="$localstatedir/run/cups"
+                       ;;
+       esac])
 +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"
++              CUPS_STATEDIR="$localstatedir/lib/cups"
 +else
-+      CUPS_STATEDIR="$statedir"
++              CUPS_STATEDIR="$statedir"
 +fi
-+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
+ 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 @@