Use ':' instead of space in paths (set IFS=:).

parent 68921a93
......@@ -8,6 +8,13 @@
# - Runs qmake
#
#
# Modifications for the Debian distribution package (june 2009)
# by Filippo Rusconi
# Copyright 2009 Filippo Rusconi
#
# - Replace ' ' with ':' along with use of "IFS=:" as word-splitting
# delimiter for PATH-related tasks (Thanks Lionel Mamane).
#
# ( originally based upon 'shell script to configure doxygen',
# http://www.stack.nl/~dimitri/doxygen/
# Copyright (C) 1997-2001 by Dimitri van Heesch )
......@@ -19,7 +26,7 @@
# See the GNU General Public License for more details
#------------------------------------------------------------------------------
bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
# bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
platform=`uname -s`
echo
......@@ -40,7 +47,7 @@ f_exiftool=NO
while test -n "$1"; do
case $1 in
--prefix | -prefix)
shift; f_prefix=$1 ; f_bindir=$1/bin ; f_datadir=$1/share/cb2bib ; f_desktopdatadir=$1/share/applications ; f_icondir=$1/share/pixmaps
shift; f_prefix="$1" ; f_bindir=$1/bin ; f_datadir=$1/share/cb2bib ; f_desktopdatadir=$1/share/applications ; f_icondir=$1/share/pixmaps
;;
--bindir | -bindir)
shift; unset f_prefix ; f_bindir=$1
......@@ -154,14 +161,16 @@ echo "Checking for Qt/qmake:"
echo -n "Checking for qmake tool... "
if test "$f_qmake" = NO; then
qmake_name="qmake"
qmake_dirs="/usr/lib64/qt4/bin /usr/lib/qt4/bin /usr/bin /usr/lib/qt/bin /usr/share/qt/bin /Developer/Tools/Qt $bin_dirs"
qmake_dirs="/usr/lib64/qt4/bin:/usr/lib/qt4/bin:/usr/bin:/usr/lib/qt/bin:/usr/share/qt/bin:/Developer/Tools/Qt:$PATH"
qmake_prog=NO
IFS=:
for j in $qmake_dirs; do
if test -x "$j/$qmake_name"; then
qmake_prog="$j/$qmake_name"
break 1
fi
done
unset IFS
f_qmake="$qmake_prog"
fi
if test "$f_qmake" = NO; then
......@@ -186,17 +195,21 @@ echo "Checking for Qt/qmake:"
fi
$f_qmake -v
bin_dirs="/usr/bin:/usr/local/bin:/bin:/sbin:$PATH"
# - check for make ------------------------------------------------------------
echo
echo "Checking for additional tools:"
echo -n "Checking for make... "
if test "$f_make" = NO; then
make_names="gmake make"
make_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
make_names="gmake:make"
make_prog=NO
IFS=:
for i in $make_names; do
for j in $make_dirs; do
for j in $bin_dirs ; do
if test -x "$j/$i"; then
if test -n "`$j/$i --version 2>/dev/null | grep GNU`"; then
make_prog="$j/$i"
......@@ -205,6 +218,7 @@ if test "$f_make" = NO; then
fi
done
done
unset IFS
f_make="$make_prog"
fi
......@@ -216,71 +230,74 @@ fi
# - check for kfmclient -------------------------------------------------------
#echo -n "Checking for kfmclient... "
#if test "$f_kfmclient" = NO; then
# kfmclient_name="kfmclient"
# kfmclient_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
# kfmclient_prog=NO
# for j in $kfmclient_dirs; do
# if test -x "$j/$kfmclient_name"; then
# if test -n "`$j/$kfmclient_name --version 2>/dev/null | grep KDE`"; then
# kfmclient_prog="$j/$kfmclient_name"
# break 1
# fi
# fi
# done
# f_kfmclient="$kfmclient_prog"
#fi
#
#if test "$f_kfmclient" != NO; then
# echo "using $f_kfmclient"
#else
# echo "not found"
#fi
echo -n "Checking for kfmclient... "
if test "$f_kfmclient" = NO; then
kfmclient_name="kfmclient"
kfmclient_prog=NO
IFS=:
for j in $bin_dirs; do
if test -x "$j/$kfmclient_name"; then
if test -n "`$j/$kfmclient_name --version 2>/dev/null | grep KDE`"; then
kfmclient_prog="$j/$kfmclient_name"
break 1
fi
fi
done
unset IFS
f_kfmclient="$kfmclient_prog"
fi
if test "$f_kfmclient" != NO; then
echo "using $f_kfmclient"
else
echo "not found"
fi
# - check for pdftotext -------------------------------------------------------
#echo -n "Checking for pdftotext... "
#if test "$f_pdftotext" = NO; then
# pdftotext_name="pdftotext"
# pdftotext_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
# pdftotext_prog=NO
# for j in $pdftotext_dirs; do
# if test -x "$j/$pdftotext_name"; then
# pdftotext_prog="$j/$pdftotext_name"
# break 1
# fi
# done
# f_pdftotext="$pdftotext_prog"
#fi
#
#if test "$f_pdftotext" != NO; then
# echo "using $f_pdftotext"
#else
# echo "not found"
#fi
echo -n "Checking for pdftotext... "
if test "$f_pdftotext" = NO; then
pdftotext_name="pdftotext"
pdftotext_prog=NO
IFS=:
for j in $pdftotext_dirs; do
if test -x "$j/$pdftotext_name"; then
pdftotext_prog="$j/$pdftotext_name"
break 1
fi
done
unset IFS
f_pdftotext="$pdftotext_prog"
fi
if test "$f_pdftotext" != NO; then
echo "using $f_pdftotext"
else
echo "not found"
fi
# - check for exiftool -------------------------------------------------------
#echo -n "Checking for exiftool... "
#if test "$f_exiftool" = NO; then
# exiftool_name="exiftool"
# exiftool_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
# exiftool_prog=NO
# for j in $exiftool_dirs; do
# if test -x "$j/$exiftool_name"; then
# exiftool_prog="$j/$exiftool_name"
# break 1
# fi
# done
# f_exiftool="$exiftool_prog"
#fi
#
#if test "$f_exiftool" != NO; then
# echo "using $f_exiftool"
#else
# echo "not found"
#fi
echo -n "Checking for exiftool... "
if test "$f_exiftool" = NO; then
exiftool_name="exiftool"
exiftool_prog=NO
IFS=:
for j in $exiftool_dirs; do
if test -x "$j/$exiftool_name"; then
exiftool_prog="$j/$exiftool_name"
break 1
fi
done
unset IFS
f_exiftool="$exiftool_prog"
fi
if test "$f_exiftool" != NO; then
echo "using $f_exiftool"
else
echo "not found"
fi
#- Setting dirs and start qmake -----------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment