1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
$NetBSD: patch-aa,v 1.3 2008/05/20 18:53:17 tnn Exp $
--- 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 を定義するための定義 */
|
