158 lines
3.8 KiB
Text
158 lines
3.8 KiB
Text
$NetBSD: patch-config-scripts_cups-directories.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
|
|
|
|
The '$' while loops expand the variables as long as possible so that no
|
|
references to other variables occur. This is necessary because fontpath
|
|
may be "${exec_prefix}", which itself may be "${prefix}", and so on. I
|
|
don't know how many levels of indirection are possible, therefore the
|
|
loop.
|
|
|
|
I'm also sure that this is not the Right Way to fix it, but at least it
|
|
works.
|
|
|
|
--- config-scripts/cups-directories.m4.orig 2014-03-21 12:42:53.000000000 -0400
|
|
+++ config-scripts/cups-directories.m4 2014-12-24 14:25:53.000000000 -0500
|
|
@@ -103,7 +103,7 @@
|
|
if test "$libdir" = "\${exec_prefix}/lib"; then
|
|
case "$uname" in
|
|
Linux*)
|
|
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
|
|
+ if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot && false; then
|
|
libdir="$exec_prefix/lib64"
|
|
fi
|
|
;;
|
|
@@ -180,7 +180,15 @@
|
|
|
|
# Data files
|
|
CUPS_DATADIR="$datadir/cups"
|
|
-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
|
|
+done=no
|
|
+while test $done = no; do
|
|
+ case "$CUPS_DATADIR" in
|
|
+ *'$'*) eval "CUPS_DATADIR=$CUPS_DATADIR";;
|
|
+ *) done=yes;;
|
|
+ esac
|
|
+done
|
|
+
|
|
+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR")
|
|
AC_SUBST(CUPS_DATADIR)
|
|
|
|
# Icon directory
|
|
@@ -189,7 +197,11 @@
|
|
if test "x$icondir" = x -a -d /usr/share/icons; then
|
|
ICONDIR="/usr/share/icons"
|
|
else
|
|
- ICONDIR="$icondir"
|
|
+ if test "x$icondir" = xno; then
|
|
+ ICONDIR=""
|
|
+ else
|
|
+ ICONDIR="$icondir"
|
|
+ fi
|
|
fi
|
|
|
|
AC_SUBST(ICONDIR)
|
|
@@ -200,7 +212,11 @@
|
|
if test "x$menudir" = x -a -d /usr/share/applications; then
|
|
MENUDIR="/usr/share/applications"
|
|
else
|
|
- MENUDIR="$menudir"
|
|
+ if test "x$menudir" = xno; then
|
|
+ MENUDIR=""
|
|
+ else
|
|
+ MENUDIR="$menudir"
|
|
+ fi
|
|
fi
|
|
|
|
AC_SUBST(MENUDIR)
|
|
@@ -215,7 +231,15 @@
|
|
CUPS_DOCROOT="$docdir"
|
|
fi
|
|
|
|
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
|
|
+done=no
|
|
+while test $done = no; do
|
|
+ case "$CUPS_DOCROOT" in
|
|
+ *'$'*) eval "CUPS_DOCROOT=$CUPS_DOCROOT";;
|
|
+ *) done=yes;;
|
|
+ esac
|
|
+done
|
|
+
|
|
+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$CUPS_DOCROOT")
|
|
AC_SUBST(CUPS_DOCROOT)
|
|
|
|
# Fonts
|
|
@@ -227,8 +251,16 @@
|
|
CUPS_FONTPATH="$fontpath"
|
|
fi
|
|
|
|
-AC_SUBST(CUPS_FONTPATH)
|
|
+done=no
|
|
+while test $done = no; do
|
|
+ case "$CUPS_FONTPATH" in
|
|
+ *'$'*) eval "CUPS_FONTPATH=$CUPS_FONTPATH";;
|
|
+ *) done=yes;;
|
|
+ esac
|
|
+done
|
|
+
|
|
AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
|
|
+AC_SUBST(CUPS_FONTPATH)
|
|
|
|
# Locale data
|
|
if test "$localedir" = "\${datarootdir}/locale"; then
|
|
@@ -246,6 +278,14 @@
|
|
CUPS_LOCALEDIR="$localedir"
|
|
fi
|
|
|
|
+done=no
|
|
+while test $done = no; do
|
|
+ case "$CUPS_LOCALEDIR" in
|
|
+ *'$'*) eval "CUPS_LOCALEDIR=$CUPS_LOCALEDIR";;
|
|
+ *) done=yes;;
|
|
+ esac
|
|
+done
|
|
+
|
|
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
|
|
AC_SUBST(CUPS_LOCALEDIR)
|
|
|
|
@@ -254,7 +294,6 @@
|
|
|
|
if test x$logdir = x; then
|
|
CUPS_LOGDIR="$localstatedir/log/cups"
|
|
- AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
|
|
else
|
|
CUPS_LOGDIR="$logdir"
|
|
fi
|
|
@@ -263,10 +302,13 @@
|
|
|
|
# Longer-term spool data
|
|
CUPS_REQUESTS="$localstatedir/spool/cups"
|
|
-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
|
|
+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS")
|
|
AC_SUBST(CUPS_REQUESTS)
|
|
|
|
# Server executables...
|
|
+AC_ARG_WITH(serverbindir, [ --with-serverbindir set path for server helper programs],serverbindir="$withval",serverbindir="")
|
|
+
|
|
+if test x$serverbindir = x; then
|
|
case "$uname" in
|
|
*BSD* | Darwin*)
|
|
# *BSD and Darwin (MacOS X)
|
|
@@ -279,6 +321,10 @@
|
|
CUPS_SERVERBIN="$exec_prefix/lib/cups"
|
|
;;
|
|
esac
|
|
+else
|
|
+ INSTALL_SYSV=""
|
|
+ CUPS_SERVERBIN="$serverbindir"
|
|
+fi
|
|
|
|
AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
|
|
AC_SUBST(CUPS_SERVERBIN)
|
|
@@ -286,7 +332,7 @@
|
|
|
|
# Configuration files
|
|
CUPS_SERVERROOT="$sysconfdir/cups"
|
|
-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
|
|
+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
|
|
AC_SUBST(CUPS_SERVERROOT)
|
|
|
|
# Transient run-time state
|