From d723e56d95ee941472b9e861e98e5b25e4e13910 Mon Sep 17 00:00:00 2001 From: nishi Date: Sat, 11 May 2024 00:48:39 +0000 Subject: [PATCH] add tool dir git-svn-id: file:///raid/svn-main/nishi-mandshurica/trunk@73 f982e544-4a7d-3444-ad1a-fde59a2a69f1 --- GNUmakefile | 3 ++- Mandshurica/config.c | 1 + build.sh | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 260e893..fe19645 100644 --- 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 94e4eea..7c500e6 100644 --- 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 234b49d..dfc2736 100755 --- 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 $? -- 2.43.0