$NetBSD$

--- Canna.conf.orig	2003-09-22 12:27:12.000000000 +0200
+++ Canna.conf
@@ -133,18 +133,18 @@
 /* rootˤʤ餺˥󥹥ȡ뤹ϤƲ */
 /* #define InstallAsUser */
 /* ȸߴΥǥ쥯ȥ깽¤ˤϤƤ */
-#define ObsoleteInstallDir
+/* #define ObsoleteInstallDir */
 #ifdef InstallAsUser
 # define DefCannaPrefix $(HOME)/canna
 # define DefErrDir $(cannaPrefix)/log
 # define DefLibCannaDir $(cannaExecPrefix)/lib
 #else 
-# define DefCannaPrefix /usr/local/canna
+# define DefCannaPrefix ${PREFIX}
 # ifdef ObsoleteInstallDir
 #  define DefErrDir /usr/spool/canna
 #  define DefLibCannaDir /usr/lib
 # else
-#  define DefErrDir /var/log
+#  define DefErrDir ${CANNA_SPOOL}
 #  define DefLibCannaDir $(cannaExecPrefix)/lib
 # endif
 #endif
@@ -164,7 +164,7 @@ XCOMM cannaLibDir = /var/lib/canna
 XCOMM cannaLibDir = /var/db/canna
 cannaLibDir = DefCannaLibDir
 XCOMM cannaManDir = $(cannaPrefix)/share/man
-cannaManDir = $(cannaPrefix)/man
+cannaManDir = $(cannaPrefix)/$(PKGMANDIR)
 cannaIncDir = $(cannaPrefix)/include/canna
 
 libCannaDir = DefLibCannaDir
@@ -173,10 +173,10 @@ ErrDir  = DefErrDir
 /* 3ԤѹʤǤ */
 wcharDefinition = -DCANNA_WCHAR
 Wlib =
-JapaneseLocale = japanese
+JapaneseLocale = ja_JP.eucJP
 
-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = ${CANNA_USER}
+cannaGroup = ${CANNA_GROUP}
 
 #ifdef InstallAsUser
 cannaOwnerGroup =
@@ -249,7 +249,7 @@ dontHaveRename = 0
  * ޥ󥯤ϡ YES ˤƤ
  */
 /* #define UseInstalledLibCanna YES */
-#define UseInstalledLibCanna NO
+#define UseInstalledLibCanna YES
 
 DicDir   = $(cannaLibDir)/dic
 
@@ -294,18 +294,18 @@ DicDir   = $(cannaLibDir)/dic
     DEPCANNALIB = $(libCannaDir)/libcanna.a
 #endif
 # endif
-       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
 #else /* ! UseInstalledLibCanna */
 # if DoSharedLib
-    DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
+    DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
 # else
 #ifdef __EMX__
-    DEPCANNALIB = $(CANNASRC)/canna.a
+    DEPCANNALIB = $(libCannaDir)/canna.a
 #else
-    DEPCANNALIB = $(CANNASRC)/libcanna.a
+    DEPCANNALIB = $(libCannaDir)/libcanna.a
 #endif
 # endif
-       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB)
 #endif /* UseInstalledLibCanna */
 
 #if UseInstalledLibCanna
@@ -314,14 +314,14 @@ DicDir   = $(cannaLibDir)/dic
 # else
     DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
 # endif
-       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
 #else /* ! UseInstalledLibCanna */
 # if DoSharedLib
-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
 # else
-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
 # endif
-       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB)
 #endif /* UseInstalledLibCanna */
 
 /*
@@ -338,7 +338,7 @@ DicDir   = $(cannaLibDir)/dic
      SCRIPTS_DEFINES = 
 
 #ifdef JAPANESEMAN
-JMNLOCALE = ja
+JMNLOCALE = ja_JP.EUC
 #endif
 
 /* USE_OBSOLETE_STYLE_FILENAME 뤿 */
