43 lines
1.6 KiB
Plaintext
43 lines
1.6 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2011/04/15 19:16:23 ajacoutot Exp $
|
|
--- configure.orig Fri Apr 15 09:41:03 2011
|
|
+++ configure Fri Apr 15 20:57:11 2011
|
|
@@ -1794,9 +1794,9 @@ echo "${ECHO_T}no" >&6; }
|
|
fi
|
|
|
|
|
|
-SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin
|
|
-BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin
|
|
-DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt
|
|
+SBINSEARCHPATH=/usr/sbin:/sbin:!!LOCALBASE!!/sbin
|
|
+BINSEARCHPATH=/usr/bin:/bin:!!LOCALBASE!!/bin
|
|
+DATASEARCHPATH=/usr/share:!!LOCALBASE!!/share:/usr/lib:!!LOCALBASE!!/lib
|
|
BSB=$BINSEARCHPATH:$SBINSEARCHPATH
|
|
for ac_dir in cups/model
|
|
do
|
|
@@ -1971,7 +1971,7 @@ DRIVERXMLS="";
|
|
while test -n "$drivers"; do
|
|
if echo $drivers |grep "," >/dev/null; then
|
|
THIS="`echo $drivers |sed -e 's/,.*//'`"
|
|
- drivers="`echo $drivers |sed -e \"s/$THIS,//\"`"
|
|
+ drivers="`echo $drivers |sed -e "s/$THIS,//"`"
|
|
else
|
|
THIS=$drivers
|
|
drivers=""
|
|
@@ -1979,14 +1979,14 @@ while test -n "$drivers"; do
|
|
case "$THIS" in
|
|
ALL)
|
|
# ALL = PRINTERS + FILES...
|
|
- DRIVERXMLS=`cd db/source/driver/; ls -1 *.xml`
|
|
+ DRIVERXMLS=`cd db/source/driver/; for i in *.xml ; do echo -n "$i " ; done`
|
|
;;
|
|
NOOBSOLETES)
|
|
OBSOLETEXMLS=`cd db/source/driver/; grep -li '< *obsolete.*/ *>' *.xml`
|
|
while test -n "$OBSOLETEXMLS"; do
|
|
if echo $OBSOLETEXMLS |grep " " >/dev/null; then
|
|
REMOVE="`echo $OBSOLETEXMLS |sed -e 's/ .*//'`"
|
|
- OBSOLETEXMLS="`echo $OBSOLETEXMLS |sed -e \"s/$REMOVE //\"`"
|
|
+ OBSOLETEXMLS="`echo $OBSOLETEXMLS |sed -e "s/$REMOVE //"`"
|
|
else
|
|
REMOVE=$OBSOLETEXMLS
|
|
OBSOLETEXMLS=""
|