1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
*** Count-config.orig Fri Sep 10 13:26:09 1999
--- Count-config Fri Sep 10 13:40:21 1999
***************
*** 20,26 ****
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"
if [ ! -f "./VERSION" ]
then
--- 20,26 ----
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="${PREFIX}/www/cgi-bin"
if [ ! -f "./VERSION" ]
then
***************
*** 37,50 ****
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"
#
--- 37,50 ----
Version=`cat ./VERSION`
Basedir="wwwcount$Version"
ConfigH="src/config.h"
! BaseDir="${PREFIX}/etc/Counter"
! LibDir="${PREFIX}/lib/Counter"
ConfigDir="$BaseDir/conf"
ConfFile="count.cfg"
! DigitDir="$LibDir/digits"
DataDir="$BaseDir/data"
! LogDir="/var/log"
! LogFile="Counter.log"
RgbFile="./data/rgb.txt"
#
***************
*** 118,124 ****
if [ .$answer = . ]
then
! answer=x
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
--- 118,124 ----
if [ .$answer = . ]
then
! answer=y
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
***************
*** 186,194 ****
then
BaseDir=$newpath
ConfigDir=$BaseDir/conf
- DigitDir=$BaseDir/digits
DataDir=$BaseDir/data
- LogDir=$BaseDir/logs
fi
#
--- 186,192 ----
***************
*** 377,383 ****
if [ .$answer = . ]
then
! answer=x
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
--- 375,381 ----
if [ .$answer = . ]
then
! answer=y
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
***************
*** 519,525 ****
** 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"
EOX
cat<<EOXXX>>$ConfigH
--- 517,523 ----
** 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 "$LibDir/rgb.txt"
EOX
cat<<EOXXX>>$ConfigH
***************
*** 540,545 ****
--- 538,544 ----
echo "CGIBIN_DIR=\"$CgiBinDir\"" > $Tmpl
echo "BASE_DIR=\"$BaseDir\"" >> $Tmpl
+ echo "LIB_DIR=\"$LibDir\"" >> $Tmpl
echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl
echo "CONFIG_DIR=\"$ConfigDir\"" >> $Tmpl
echo "DIGIT_DIR=\"$DigitDir\"" >> $Tmpl
***************
*** 547,553 ****
echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
! echo "RGB_DIR=\"$BaseDir\"" >> $Tmpl
##
# create template for install program --ends
##
--- 546,552 ----
echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
! echo "RGB_DIR=\"$LibDir\"" >> $Tmpl
##
# create template for install program --ends
##
|
