$NetBSD: patch-aa,v 1.2 1999/12/08 09:16:26 rh Exp $

--- Canna.conf.orig	Thu Nov 28 11:27:01 1996
+++ Canna.conf	Wed Dec  8 10:14:38 1999
@@ -129,19 +129,19 @@
  */
 
-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}/share/canna
+cannaManDir = ${PREFIX}/man/ja_JP.EUC
+cannaIncDir = ${PREFIX}/include/canna
+libCannaDir = ${PREFIX}/lib
 
-ErrDir  = /usr/spool/canna
+ErrDir  = ${CANNA_SPOOL}
 
 wcharDefinition = -DCANNA_WCHAR
 Wlib =
-JapaneseLocale = japanese
+JapaneseLocale = ja_JP.eucJP
 
-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = ${CANNAOWNER}
+cannaGroup = ${CANNAGROUP}
 
 cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
@@ -149,5 +149,5 @@
 pointerIntegerDef =
 
-cannaDsoRev = 1
+cannaDsoRev = 1.0
     /* SunOS 4.x 򤪻Ȥ shared object Ѥˤ
             cannaDsoRev = 1.1
@@ -202,8 +202,7 @@
  * ޥ󥯤ϡ YES ˤƤ
  */
-/* #define UseInstalledLibCanna YES */
-#define UseInstalledLibCanna NO
+#define UseInstalledLibCanna YES
 
-DicDir   = $(cannaLibDir)/dic
+DicDir   = ${DICT_DIR}/canna
 
 #ifdef NeXT
@@ -240,16 +239,16 @@
 #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$(libCannaDir) -lcanna $(DLLIB)
 #endif /* UseInstalledLibCanna */
 
@@ -260,12 +259,12 @@
     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$(libCannaDir) -lcanna16 $(DLLIB)
 #endif /* UseInstalledLibCanna */
 
