|
 |
352478 |
diff -up foomatic-db-engine-4.0.7/configure.ac.libdir foomatic-db-engine-4.0.7/configure.ac
|
|
|
352478 |
--- foomatic-db-engine-4.0.7/configure.ac.libdir 2011-02-18 13:30:22.000000000 +0100
|
|
|
352478 |
+++ foomatic-db-engine-4.0.7/configure.ac 2011-02-21 12:43:24.000000000 +0100
|
|
|
352478 |
@@ -69,8 +69,8 @@ LOGSEARCHPATH=/var/log:/usr/log:/usr/loc
|
|
cvsdist |
7be4b8 |
SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc
|
|
cvsdist |
7be4b8 |
SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin
|
|
cvsdist |
7be4b8 |
BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin
|
|
cvsdist |
7be4b8 |
-DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt
|
|
cvsdist |
9435e6 |
-LIBSEARCHPATH=/usr/lib:/lib:/usr/local/lib:/usr/local/libexec:/opt
|
|
cvsdist |
7be4b8 |
+DATASEARCHPATH=/usr/share:/usr/local/share:$libdir:/usr/local/lib:/opt
|
|
cvsdist |
9435e6 |
+LIBSEARCHPATH=$libdir:/lib:/usr/local/lib:/usr/local/libexec:/opt
|
|
cvsdist |
7be4b8 |
PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal
|
|
cvsdist |
7be4b8 |
MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev
|
|
cvsdist |
7be4b8 |
|
|
|
352478 |
@@ -257,15 +257,15 @@ AC_PATH_PROGS(CUPS_LPOPTIONS,lpoptions,/
|
|
cvsdist |
7be4b8 |
AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH)
|
|
cvsdist |
7be4b8 |
|
|
|
352478 |
# Paths for PDQ
|
|
|
352478 |
-FM_PATH_DIRS(PDQ_CONF,pdq,/usr/lib/pdq,$SYS_LIB_PATH)
|
|
|
352478 |
+FM_PATH_DIRS(PDQ_CONF,pdq,$libdir/pdq,$SYS_LIB_PATH)
|
|
cvsdist |
9435e6 |
AC_PATH_PROGS(PDQ_PRINTRC,pdq/printrc,$PDQ_CONF/printrc,$SYS_LIB_PATH)
|
|
cvsdist |
7be4b8 |
dnl PDQ_FOOMATIC=$PDQ_CONF/drivers/foomatic
|
|
cvsdist |
7be4b8 |
AC_PATH_PROGS(PDQ_PRINT,pdq lpr-pdq,/usr/bin/pdq,$BINSEARCHPATH)
|
|
cvsdist |
7be4b8 |
dnl PDQ_JOBDIR=~/.printjobs
|
|
cvsdist |
7be4b8 |
|
|
|
352478 |
# Paths for PPR
|
|
cvsdist |
7be4b8 |
-AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,/usr/lib/ppr/bin/pprd,$LIBSEARCHPATH)
|
|
|
352478 |
-FM_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
|
|
cvsdist |
7be4b8 |
+AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,$libdir/ppr/bin/pprd,$LIBSEARCHPATH)
|
|
|
352478 |
+FM_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH)
|
|
|
352478 |
FM_PATH_DIRS(PPR_PPDFILES,ppr/PPDFiles,/usr/share/ppr/PPDFiles,$DATASEARCHPATH)
|
|
|
352478 |
FM_PATH_DIRS(PPR_ETC,ppr,/etc/ppr,$SYSCONFSEARCHPATH)
|
|
cvsdist |
7be4b8 |
AC_PATH_PROGS(PPR_PPR,ppr lpr-ppr,/usr/bin/ppr,$BINSEARCHPATH)
|