30c404c8a0
* Complete CANNA_OWNER -> CANNA_USER change, which was mostly done by Julio Merino a few days ago.
101 lines
3 KiB
Text
101 lines
3 KiB
Text
$NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $
|
|
|
|
--- Canna.conf.orig Sat Jan 25 17:47:47 2003
|
|
+++ 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
|
|
@@ -173,10 +173,10 @@
|
|
/* 次の3行は変更しないでください */
|
|
wcharDefinition = -DCANNA_WCHAR
|
|
Wlib =
|
|
-JapaneseLocale = japanese
|
|
+JapaneseLocale = ja_JP.eucJP
|
|
|
|
-cannaOwner = bin
|
|
-cannaGroup = bin
|
|
+cannaOwner = ${CANNA_USER}
|
|
+cannaGroup = ${CANNA_GROUP}
|
|
|
|
#ifdef InstallAsUser
|
|
cannaOwnerGroup =
|
|
@@ -246,7 +246,7 @@
|
|
* コマンド類をリンクする時は、次を YES にしてくだい。
|
|
*/
|
|
/* #define UseInstalledLibCanna YES */
|
|
-#define UseInstalledLibCanna NO
|
|
+#define UseInstalledLibCanna YES
|
|
|
|
DicDir = $(cannaLibDir)/dic
|
|
|
|
@@ -291,18 +291,18 @@
|
|
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
|
|
@@ -311,14 +311,14 @@
|
|
# 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 */
|
|
|
|
/*
|
|
@@ -335,7 +335,7 @@
|
|
SCRIPTS_DEFINES =
|
|
|
|
#ifdef JAPANESEMAN
|
|
-JMNLOCALE = ja
|
|
+JMNLOCALE = ja_JP.EUC
|
|
#endif
|
|
|
|
/* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */
|