| 1 |
diff -ruN Canna37p1.orig/Canna.conf Canna37p1/Canna.conf
|
| 2 |
--- Canna37p1.orig/Canna.conf 2004-01-02 21:26:27.000000000 +0900
|
| 3 |
+++ Canna37p1/Canna.conf 2004-04-30 17:45:30.268087408 +0900
|
| 4 |
@@ -109,12 +109,12 @@
|
| 5 |
# define DefErrDir $(cannaPrefix)/log
|
| 6 |
# define DefLibCannaDir $(cannaExecPrefix)/lib
|
| 7 |
#else
|
| 8 |
-# define DefCannaPrefix /usr/local/canna
|
| 9 |
+# define DefCannaPrefix /usr
|
| 10 |
# ifdef ObsoleteInstallDir
|
| 11 |
# define DefErrDir /usr/spool/canna
|
| 12 |
# define DefLibCannaDir /usr/lib
|
| 13 |
# else
|
| 14 |
-# define DefErrDir /var/log
|
| 15 |
+# define DefErrDir /var/log/canna
|
| 16 |
# define DefLibCannaDir $(cannaExecPrefix)/lib
|
| 17 |
# endif
|
| 18 |
#endif
|
| 19 |
@@ -123,7 +123,7 @@
|
| 20 |
# define DefCannaLibDir $(cannaPrefix)/lib
|
| 21 |
#else
|
| 22 |
# define DefCannaSrvDir $(cannaExecPrefix)/sbin
|
| 23 |
-# define DefCannaLibDir $(cannaPrefix)/share/canna
|
| 24 |
+# define DefCannaLibDir $(cannaPrefix)/lib
|
| 25 |
#endif
|
| 26 |
|
| 27 |
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
|
| 28 |
@@ -146,9 +146,11 @@
|
| 29 |
cannaSrvDir = DefCannaSrvDir
|
| 30 |
XCOMM cannaLibDir = /var/lib/canna
|
| 31 |
XCOMM cannaLibDir = /var/db/canna
|
| 32 |
-cannaLibDir = DefCannaLibDir
|
| 33 |
+cannaLibDir = /etc/canna
|
| 34 |
+cannaEtcDir = /etc/canna
|
| 35 |
+cannaShareDir = $(cannaPrefix)/share/canna
|
| 36 |
XCOMM cannaManDir = $(cannaPrefix)/share/man
|
| 37 |
-cannaManDir = $(cannaPrefix)/man
|
| 38 |
+cannaManDir = $(cannaPrefix)/share/man
|
| 39 |
cannaIncDir = $(cannaPrefix)/include/canna
|
| 40 |
|
| 41 |
libCannaDir = DefLibCannaDir
|
| 42 |
@@ -158,7 +160,7 @@
|
| 43 |
#define SupportOldWchar 1
|
| 44 |
|
| 45 |
/* IPv6¤òÍѤ¤¤ë¾ì¹ç¤Ï1¤ÈÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
|
| 46 |
-#define UseInet6 0 /* requires newer IPv6 implementation */
|
| 47 |
+#define UseInet6 1 /* requires newer IPv6 implementation */
|
| 48 |
|
| 49 |
/* 3.2·Ï¤«¤é3.6·Ï¤Þ¤Ç¤Î·Á¼°¤Î¼½ñ¤òºî¤ë¾ì¹ç¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
|
| 50 |
/* #define DIC_3_6_COMPAT */
|
| 51 |
@@ -175,10 +177,10 @@
|
| 52 |
#ifdef InstallAsUser
|
| 53 |
cannaOwnerGroup =
|
| 54 |
#else
|
| 55 |
-cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
|
| 56 |
+cannaOwnerGroup =
|
| 57 |
#endif
|
| 58 |
|
| 59 |
-cannaDsoRev = 1.2
|
| 60 |
+cannaDsoRev = 1.2.0
|
| 61 |
|
| 62 |
#if defined(cygwinArchitecture)
|
| 63 |
/* import library¤ÎÊý¤ò»ØÄꤷ¤Æ¤ª¤¯¡£DLLËÜÂΤÏ/usr/X11R6/bin¤ËÆþ¤ë¡£ */
|
| 64 |
@@ -199,8 +201,8 @@
|
| 65 |
CHGRP = :
|
| 66 |
CHMOD = :
|
| 67 |
#else
|
| 68 |
-CHOWN = chown
|
| 69 |
-CHGRP = chgrp
|
| 70 |
+CHOWN = echo
|
| 71 |
+CHGRP = echo
|
| 72 |
CHMOD = chmod
|
| 73 |
#endif
|
| 74 |
|
| 75 |
@@ -237,7 +239,7 @@
|
| 76 |
/* #define UseInstalledLibCanna YES */
|
| 77 |
#define UseInstalledLibCanna NO
|
| 78 |
|
| 79 |
-DicDir = $(cannaLibDir)/dic
|
| 80 |
+DicDir = /var/lib/canna/dic
|
| 81 |
|
| 82 |
/* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */
|
| 83 |
|
| 84 |
@@ -339,10 +341,10 @@
|
| 85 |
#endif
|
| 86 |
|
| 87 |
#ifdef InstallAsUser
|
| 88 |
-UnixSockDir = $(cannaPrefix)/tmp/.iroha_unix
|
| 89 |
+UnixSockDir = $(cannaPrefix)/var/run/.iroha_unix
|
| 90 |
AccessFile = $(cannaPrefix)/etc/hosts.canna
|
| 91 |
#else
|
| 92 |
-UnixSockDir = /tmp/.iroha_unix
|
| 93 |
+UnixSockDir = /var/run/.iroha_unix
|
| 94 |
AccessFile = /etc/hosts.canna
|
| 95 |
#endif
|
| 96 |
UnixSockName = IROHA
|
| 97 |
diff -ruN Canna37p1.orig/Imakefile Canna37p1/Imakefile
|
| 98 |
--- Canna37p1.orig/Imakefile 2003-12-28 02:15:20.000000000 +0900
|
| 99 |
+++ Canna37p1/Imakefile 2004-04-30 17:45:01.586886913 +0900
|
| 100 |
@@ -58,6 +58,7 @@
|
| 101 |
@echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk
|
| 102 |
@echo "/* for lib/canna */" >> junkjunk
|
| 103 |
@echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk
|
| 104 |
+ @echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk
|
| 105 |
@echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk
|
| 106 |
@echo "/* for scripts */" >> junkjunk
|
| 107 |
@echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk
|
| 108 |
@@ -89,6 +90,7 @@
|
| 109 |
echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
|
| 110 |
echo "/* for lib/canna */";\
|
| 111 |
echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
|
| 112 |
+ echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
|
| 113 |
echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
|
| 114 |
echo "/* for scripts */";\
|
| 115 |
echo "#define CANNABINDIR $(cannaBinDir)"; \
|
| 116 |
diff -ruN Canna37p1.orig/dic/phono/Imakefile Canna37p1/dic/phono/Imakefile
|
| 117 |
--- Canna37p1.orig/dic/phono/Imakefile 2002-10-19 17:27:40.000000000 +0900
|
| 118 |
+++ Canna37p1/dic/phono/Imakefile 2004-04-30 17:45:01.587886780 +0900
|
| 119 |
@@ -28,6 +28,7 @@
|
| 120 |
ROMAJI_DIC_DEF = -DSHIFT
|
| 121 |
|
| 122 |
DICDIR = $(cannaLibDir)/dic
|
| 123 |
+ CANNASHAREDIR = $(cannaShareDir)
|
| 124 |
SAMPLEDIR = $(cannaLibDir)/sample
|
| 125 |
SAMPLESRCDIR = $(cannaLibDir)/sample/src
|
| 126 |
|
| 127 |
@@ -69,7 +70,7 @@
|
| 128 |
MakeDirectories(install,$(DICDIR))
|
| 129 |
MakeDirectories(install,$(SAMPLESRCDIR))
|
| 130 |
|
| 131 |
-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
|
| 132 |
+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
|
| 133 |
|
| 134 |
#ifdef USE_OBSOLETE_STYLE_FILENAME
|
| 135 |
InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
|
| 136 |
diff -ruN Canna37p1.orig/misc/initfiles/Imakefile Canna37p1/misc/initfiles/Imakefile
|
| 137 |
--- Canna37p1.orig/misc/initfiles/Imakefile 2003-02-04 05:13:01.000000000 +0900
|
| 138 |
+++ Canna37p1/misc/initfiles/Imakefile 2004-04-30 17:45:01.587886780 +0900
|
| 139 |
@@ -6,7 +6,7 @@
|
| 140 |
#endif
|
| 141 |
|
| 142 |
CANNAROOT = ../..
|
| 143 |
- SAMPLEDIR = $(cannaLibDir)/sample
|
| 144 |
+ SAMPLEDIR = $(cannaShareDir)
|
| 145 |
|
| 146 |
all::
|
| 147 |
|
Parent Directory
| 
Revision Log