add tool dir

git-svn-id: file:///raid/svn-main/nishi-mandshurica/trunk@73 f982e544-4a7d-3444-ad1a-fde59a2a69f1

diff --git a/GNUmakefile b/GNUmakefile
index 260e89350d755b85080c296729538ca4829442ab..fe196451a30d456f4670d82f0ad74aae86f539d5 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,9 +3,10 @@ PREFIX := /usr/local
 MODULE_PREFIX := $(PREFIX)/lib/mandshurica
 WEBROOT_PREFIX := $(PREFIX)/lib/mandshurica/webroot
 PROJECTS_PREFIX := $(PREFIX)/lib/mandshurica/projects
+TOOL_PREFIX := $(PREFIX)/lib/mandshurica/tool
 
 CC := gcc
-CFLAGS := -g -std=c99 -DPREFIX=\\\"$(PREFIX)\\\" -DWEBROOT_PREFIX=\\\"$(WEBROOT_PREFIX)\\\" -DMODULE_PREFIX=\\\"$(MODULE_PREFIX)\\\" -DPROJECTS_PREFIX=\\\"$(PROJECTS_PREFIX)\\\" -D_DEFAULT_SOURCE
+CFLAGS := -g -std=c99 -DPREFIX=\\\"$(PREFIX)\\\" -DWEBROOT_PREFIX=\\\"$(WEBROOT_PREFIX)\\\" -DMODULE_PREFIX=\\\"$(MODULE_PREFIX)\\\" -DPROJECTS_PREFIX=\\\"$(PROJECTS_PREFIX)\\\" -DTOOL_PREFIX=\\\"$(TOOL_PREFIX)\\\" -D_DEFAULT_SOURCE
 LDFLAGS :=
 LIBS :=
 

diff --git a/Mandshurica/config.c b/Mandshurica/config.c
index 94e4eeab7d12642bbb1b31d604a4f2adc812812a..7c500e60174456e9c01995df529cbfec567dd3af 100644 (file)
--- a/Mandshurica/config.c
+++ b/Mandshurica/config.c
@@ -211,6 +211,7 @@ int mandshurica_create_config(const char* path) {
                fprintf(f, "Set CookieDB %s/passwd.db\n", PREFIX);
                fprintf(f, "Set HTTPPort 1024\n");
                fprintf(f, "Set HTTPRoot %s\n", WEBROOT_PREFIX);
+               fprintf(f, "Set HTMLManage %s/html-manage\n", TOOL_PREFIX);
                fprintf(f, "Set ProjectRoot %s\n", WEBROOT_PREFIX);
                fprintf(f, "Set InstanceName Sumire\n");
                fprintf(f, "\n");

diff --git a/build.sh b/build.sh
index 234b49d27cfab4621536657048f091266efd10be..dfc273636aeb4bc5a4eb0dd584354880b0913895 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 which gmake 2>/dev/null
 if [ "$?" = "0" ]; then
        MAKE=gmake
@@ -6,8 +7,8 @@ else
        MAKE=make
 fi
 if [ "`uname -s`" = "NetBSD" ]; then
-       $MAKE PREFIX=`pwd` MODULE_PREFIX=`pwd`/Module WEBROOT_PREFIX=`pwd`/Webroot PROJECTS_PREFIX=`pwd`/Projects -j`cat /proc/cpuinfo | grep proc | wc -l`
+       $MAKE PREFIX=`pwd` MODULE_PREFIX=`pwd`/Module WEBROOT_PREFIX=`pwd`/Webroot PROJECTS_PREFIX=`pwd`/Projects TOOL_PREFIX=`pwd`/Tool -j`cat /proc/cpuinfo | grep proc | wc -l`
 else
-       $MAKE PREFIX=`pwd` MODULE_PREFIX=`pwd`/Module WEBROOT_PREFIX=`pwd`/Webroot PROJECTS_PREFIX=`pwd`/Projects -j`nproc`
+       $MAKE PREFIX=`pwd` MODULE_PREFIX=`pwd`/Module WEBROOT_PREFIX=`pwd`/Webroot PROJECTS_PREFIX=`pwd`/Projects TOOL_PREFIX=`pwd`/Tool -j`nproc`
 fi
 exit $?