--- Canna.conf.orig	Thu Oct 24 23:37:25 2002
+++ Canna.conf	Thu Nov 14 09:28:18 2002
@@ -132,11 +132,12 @@
 
 /* rootˤʤ餺˥󥹥ȡ뤹ϤƲ */
 /* #define InstallAsUser */
-cannaPrefix = /usr/local/canna
+PREFIX?= /usr/local
+cannaPrefix = $(PREFIX)
 cannaExecPrefix = $(cannaPrefix)
 cannaBinDir = $(cannaExecPrefix)/bin
-cannaSrvDir = $(cannaExecPrefix)/bin
-cannaLibDir = $(cannaPrefix)/lib
+cannaSrvDir = $(cannaExecPrefix)/sbin
+cannaLibDir = $(cannaPrefix)/lib/canna
 cannaManDir = $(cannaPrefix)/man
 cannaIncDir = $(cannaPrefix)/include/canna
 
@@ -144,8 +145,8 @@
 libCannaDir = $(cannaExecPrefix)/lib
 ErrDir  = $(cannaExecPrefix)/log
 #else
-libCannaDir = /usr/lib
-ErrDir  = /usr/spool/canna
+libCannaDir = $(cannaPrefix)/lib
+ErrDir  = /var/log
 #endif
 
 /* 3ԤѹʤǤ */
@@ -164,7 +165,7 @@
 
 pointerIntegerDef =
 
-cannaDsoRev = 1
+cannaDsoRev = 1.0
     /* SunOS 4.x 򤪻Ȥ shared object Ѥˤ
             cannaDsoRev = 1.1
     ȻꤷƤޤFreeBSD Ѥϡ
@@ -308,7 +309,7 @@
  * 鲼ѹʤ褦ˤƤ
  */
 
- CANNASERVER_DEFINES = $(wcharDefinition)
+ CANNASERVER_DEFINES = $(wcharDefinition) $(cannaOwnerDefinition)
           RK_DEFINES = $(pointerIntegerDef)
          RKC_DEFINES = $(wcharDefinition)
        UILIB_DEFINES = $(wcharDefinition) $(pointerIntegerDef) \
