7def2ac872
CUPS version upgrade to 2.1.0 OBS-URL: https://build.opensuse.org/request/show/328313 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=309
18 lines
699 B
Diff
18 lines
699 B
Diff
--- config-scripts/cups-directories.m4.orig 2014-03-21 17:42:53.000000000 +0100
|
|
+++ config-scripts/cups-directories.m4 2015-09-01 11:08:43.000000000 +0200
|
|
@@ -206,11 +206,11 @@ fi
|
|
AC_SUBST(MENUDIR)
|
|
|
|
# Documentation files
|
|
-AC_ARG_WITH(docdir, [ --with-docdir set path for documentation],docdir="$withval",docdir="")
|
|
+AC_ARG_WITH(docdir, [ --with-docdir set path and DocumentRoot directive for web content, default=datadir/cups/webcontent],docdir="$withval",docdir="")
|
|
|
|
if test x$docdir = x; then
|
|
- CUPS_DOCROOT="$datadir/doc/cups"
|
|
- docdir="$datadir/doc/cups"
|
|
+ CUPS_DOCROOT="$datadir/cups/webcontent"
|
|
+ docdir="$datadir/cups/webcontent"
|
|
else
|
|
CUPS_DOCROOT="$docdir"
|
|
fi
|