$NetBSD: patch-aa,v 1.5 2006/07/19 19:48:21 jlam Exp $ --- Count-config.orig 1999-01-03 15:07:58.000000000 -0800 +++ Count-config @@ -20,7 +20,7 @@ trap 'echo '';echo "Interrupt detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15 Tmpl="./Config.tmpl" -CgiBinDir="/usr/local/etc/httpd/cgi-bin" +CgiBinDir="${PREFIX}/libexec/cgi-bin" if [ ! -f "./VERSION" ] then @@ -35,17 +35,16 @@ fi AUTHOR="ma_muquit@fccc.edu" Version=`cat ./VERSION` -Basedir="wwwcount$Version" ConfigH="src/config.h" -BaseDir="/usr/local/etc/Counter" -ConfigDir="$BaseDir/conf" -ConfFile="count.cfg" -DigitDir="$BaseDir/digits" -DataDir="$BaseDir/data" -LogDir="$BaseDir/logs" -ext=`echo $Version | sed 's/\./_/g'` -LogFile="Count$ext.log" -RgbFile="./data/rgb.txt" +BaseDir="${PREFIX}/etc" +LibDir="${PREFIX}/libdata/wwwcount" +ConfigDir="${PKG_SYSCONFDIR}" +ConfFile="wwwcount.conf" +DigitDir="$LibDir/digits" +DataDir="${VARBASE}/db/wwwcount" +LogDir="${VARBASE}/log" +LogFile="wwwcount" +RgbFile="rgb.txt" # # from php/fis install script @@ -118,7 +117,7 @@ read answer if [ .$answer = . ] then - answer=x + answer=y fi until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do @@ -377,7 +376,7 @@ read answer if [ .$answer = . ] then - answer=x + answer=y fi until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do @@ -519,7 +518,7 @@ cat<>$ConfigH ** so RGB names can be looked up, but yet not allow users to make constant ** use of this very ineffiecient lookup. */ -#define RGB_MAPPING_DICT "$BaseDir/rgb.txt" +#define RGB_MAPPING_DICT "$LibDir/rgb.txt" EOX cat<>$ConfigH @@ -547,7 +546,7 @@ echo "DATA_DIR=\"$DataDir\"" >> $Tmpl echo "LOG_DIR=\"$LogDir\"" >> $Tmpl echo "LOG_FILE=\"$LogFile\"" >> $Tmpl echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl -echo "RGB_DIR=\"$BaseDir\"" >> $Tmpl +echo "RGB_DIR=\"$LibDir\"" >> $Tmpl ## # create template for install program --ends ##