fix multiple stuff

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

diff --git a/Makefile b/Makefile
index 96d9c2ba8061fa41d32b38fe85ae14c824756085..b84110cc82d6025e7a60e60b65b798e3d74bee4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ all: ./Server ./Module ./Tool/genconf ./Tool/itworks
        sed "s/@VERSION@/`grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed -E 's/^"//g'`/g" ./README.tmpl > $@
 
 install: all ./Tool/genconf ./Tool/itworks
-       mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/share/man/man5 $(PREFIX)/etc $(PREFIX)/www
+       mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/etc $(PREFIX)/www
        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

diff --git a/Platform/cygwin.mk b/Platform/cygwin.mk
index c624c6d8c765eafabf6650f017c2fa51abb18b58..5e45edb384b1c7be50dd63a2dc276a5df08fe62f 100644 (file)
--- a/Platform/cygwin.mk
+++ b/Platform/cygwin.mk
@@ -2,7 +2,7 @@
 
 CC = cc
 AR = ar
-CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common -fPIC -DNO_IPV6
+CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common
 LDFLAGS =
 LIBS =
 EXEC =

diff --git a/Server/main.c b/Server/main.c
index 44f10c72d3f58926df4ed4aeaeb5c1a7b5b62e66..59789eca3f08e82ff16993796e73ec56d26ebfef 100644 (file)
--- a/Server/main.c
+++ b/Server/main.c
@@ -86,6 +86,7 @@ int main(int argc, char** argv) {
        if(st != -1) return st;
        tw_server_loop();
 #endif
+       return 0;
 }
 
 int startup(int argc, char** argv) {

diff --git a/Server/tw_version.h b/Server/tw_version.h
index c7b8bb74804b0a29636cbb24ad34103b94675f72..ada4f4d19d18e68cd6d18ff659e409969f20b51d 100644 (file)
--- a/Server/tw_version.h
+++ b/Server/tw_version.h
@@ -7,7 +7,7 @@
 extern "C" {
 #endif
 
-#define TW_VERSION "1.08B\0"
+#define TW_VERSION "1.08C\0"
 
 const char* tw_get_version(void);
 const char* tw_get_platform(void);

diff --git a/Tool/genconf.c b/Tool/genconf.c
index 450c7e0459e8f33cfbafb4f47771cfbd39f9c538..b8e35d16014d5aa7a7797c6e1a364df156f654b6 100644 (file)
--- a/Tool/genconf.c
+++ b/Tool/genconf.c
@@ -45,4 +45,5 @@ int main(int argc, char** argv) {
        printf("BeginDirectory %s/www\n", argv[1]);
        printf("        Allow all\n");
        printf("EndDirectory\n", argv[1]);
+       return 0;
 }

diff --git a/Tool/itworks.c b/Tool/itworks.c
index 5089b622ace783151f33acb34de8ea21cfe74be7..e0af8db3a611ff45115000468e69013faa1db8df 100644 (file)
--- a/Tool/itworks.c
+++ b/Tool/itworks.c
@@ -32,4 +32,5 @@ int main() {
        printf("                </div>\n");
        printf("        </body>\n");
        printf("</html>\n");
+       return 0;
 }

diff --git a/Tool/option.c b/Tool/option.c
index 7c99294edd574ca48482d49d40f24b754b47360c..473f8be14646555a5d14580d057da4b700932e90 100644 (file)
--- a/Tool/option.c
+++ b/Tool/option.c
@@ -28,4 +28,5 @@ int main(int argc, char** argv) {
 #endif
        }
        printf("\n");
+       return 0;
 }