--- Canna.conf.orig	Wed Apr 12 22:15:03 1995
+++ Canna.conf	Fri Oct 17 23:05:25 1997
@@ -114,15 +114,15 @@
  * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $
  */
 
-cannaBinDir = /usr/local/canna/bin
-cannaSrvDir = /usr/local/canna/bin
-cannaLibDir = /usr/local/canna/lib
-cannaManDir = /usr/local/canna/man
-cannaIncDir = /usr/local/canna/include/canna
-libCannaDir = /usr/lib
+cannaBinDir = ${PREFIX}/bin
+cannaSrvDir = ${PREFIX}/sbin
+cannaLibDir = ${PREFIX}/lib/canna
+cannaManDir = ${PREFIX}/man
+cannaIncDir = ${PREFIX}/include/canna
+libCannaDir = ${PREFIX}/lib
 
-ErrDir  = /usr/spool/canna
-LockDir = /usr/spool/canna/lock
+ErrDir  = /var/log
+LockDir = /var/run/canna
 
 wcharDefinition = -DCANNA_WCHAR
 Wlib =
@@ -135,7 +135,7 @@
 
 pointerIntegerDef =
 
-cannaDsoRev = 1
+cannaDsoRev = 1.0
 sharedLibExtension = so.$(cannaDsoRev)
 
 /* 以下の３つは root にならないでインストールするのであれば echo に
@@ -145,7 +145,7 @@
 CHMOD = chmod
 
 /* 日本語マニュアルを使わないのであればコメントアウト */
-#define JAPANESEMAN
+/* #define JAPANESEMAN */
 
 /* locale ディレクトリを持っている場合は以下を記述する */
 /* #define LOCALE_DIR /usr/lib/locale */
@@ -178,7 +178,7 @@
 #define UseInstalledLibCanna NO
 
 DicDir   = $(cannaLibDir)/dic
-LockFile = .CANNALOCK
+LockFile = Canna.pid
 
 #ifdef NeXT
 #define NO_X_ENV
@@ -311,13 +311,13 @@
 #endif
 #define InstallLibManPageAliases(file,destdir,aliases)			@@\
 install.man::								@@\
-        @(TMP=/tmp/tmp.$$$$; \						@@\
-        $(RM) $${TMP}; \						@@\
-        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-        for i in aliases; do (set -x; \					@@\
-        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-        done; \								@@\
-        $(RM) $${TMP})
+	@(TMP=/tmp/tmp.$$$$; \						@@\
+	$(RM) $${TMP}; \						@@\
+	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
+	for i in aliases; do (set -x; \					@@\
+	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
+	done; \								@@\
+	$(RM) $${TMP})
 #ifndef MakeDirectoriesLong
 #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
 step::									@@\