fix genconf

git-svn-id: file:///raid/svn-personal/tewi/trunk@131 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Makefile b/Makefile
index de7e8f234763ac9253c9c16fd4bdc6d49e927898..45d00eb2807df37a95be79d3a6b3816e16ae0cfe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ all: ./Server ./Module ./Manpage ./Tool/genconf ./Tool/itworks
 
 install: all ./Tool/genconf ./Tool/itworks
        mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/share/man/man5 $(PREFIX)/etc $(PREFIX)/www
-       if [ ! -e $(PREFIX)/etc/tewi.conf ]; then ( ./Tool/genconf $(PREFIX) > $(PREFIX)/etc/tewi.conf || ( rm $(PREFIX)/etc/tewi.conf ; exit 1 ) ) ; fi
+       if [ ! -e $(PREFIX)/etc/tewi.conf ]; then ( ./Tool/genconf $(PREFIX) lib/tewi so > $(PREFIX)/etc/tewi.conf || ( rm $(PREFIX)/etc/tewi.conf ; exit 1 ) ) ; fi
        if [ ! -e $(PREFIX)/www/index.html ]; then ( ./Tool/itworks > $(PREFIX)/www/index.html || ( rm $(PREFIX)/www/index.html ; exit 1 ) ) ; fi
        if [ ! -e $(PREFIX)/www/pbtewi.gif ]; then ( cp Binary/pbtewi.gif $(PREFIX)/www/ || ( rm $(PREFIX)/www/pbtewi.gif ; exit 1 ) ) ; fi
        cp ./Server/tewi $(PREFIX)/bin/

diff --git a/Server/tw_version.h b/Server/tw_version.h
index c7889d98dfc7a41bd58a62d22f9860da7b22cb23..beb0f3a51750a96ea72fe5de053566dbde4a552a 100644 (file)
--- a/Server/tw_version.h
+++ b/Server/tw_version.h
@@ -3,7 +3,7 @@
 #ifndef __TW_VERSION_H__
 #define __TW_VERSION_H__
 
-#define TW_VERSION "1.04A\0"
+#define TW_VERSION "1.04B\0"
 
 const char* tw_get_version(void);
 const char* tw_get_platform(void);

diff --git a/Tool/genconf.c b/Tool/genconf.c
index ef4244b2f7c81f5cba9deeee26b3e1ea9c0a049c..4853ca3e09214ed5fe8b9b045be71d19077a913e 100644 (file)
--- a/Tool/genconf.c
+++ b/Tool/genconf.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 int main(int argc, char** argv) {
-       if(argc < 2) {
+       if(argc < 4) {
                return 1;
        }
        printf("##\n");
@@ -18,8 +18,8 @@ int main(int argc, char** argv) {
        printf("\n");
        printf("ServerAdmin %s\n", SERVER_ADMIN);
        printf("\n");
-       printf("LoadModule lib/tewi/mod_cgi.so\n");
-       printf("#LoadModule lib/tewi/mod_proxy.so\n");
+       printf("LoadModule %s/mod_cgi.%s\n", argv[2], argv[3]);
+       printf("#LoadModule %s/mod_proxy.%s\n", argv[2], argv[3]);
        printf("\n");
        printf("Listen 80\n");
        printf("#ListenSSL 443\n");

diff --git a/installer.sh b/installer.sh
index 5c784e0441cdaf25c8d75827e87d62cc6d45cd16..85878c7305eb5980c93158e4acad130b3fdf63bf 100755 (executable)
--- a/installer.sh
+++ b/installer.sh
@@ -22,7 +22,7 @@ make clean || fail
 make PLATFORM=$1-service -j4 || fail
 cp Server/tewi.exe tewi-service.exe
 cd Server
-../Tool/genconf "C:/Tewi" > ../generated.conf
+../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
 ../Tool/itworks > ../itworks.html
 makensis -DVERSION=$VERSION install.nsi
 cp install.exe ../install-nossl.exe
@@ -38,7 +38,7 @@ make clean || fail
 make PLATFORM=$1-service -j4 || fail
 cp Server/tewi.exe tewi-service.exe
 cd Server
-../Tool/genconf "C:/Tewi" > ../generated.conf
+../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
 ../Tool/itworks > ../itworks.html
 makensis -DVERSION=$VERSION install.nsi
 cp install.exe ../install-ssl.exe