diff options
| author | Jun-ichiro itojun Hagino <itojun@FreeBSD.org> | 1997-10-17 15:59:05 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@FreeBSD.org> | 1997-10-17 15:59:05 +0000 |
| commit | 69e4331ab085cb7307880d679e0611d0bfc484a0 (patch) | |
| tree | d3c79b9e1075dd814077de2e386f8082f1a33b28 /japanese/canna-lib/files/patch-ac | |
| parent | original distribution updated to 2.0. (diff) | |
due to /var/run permission change in 2.2.5-RELEASE, we changed
change where to write pid file.
Submitted by: sanpei@jp.freebsd.org
Notes
Notes:
svn path=/head/; revision=8311
Diffstat (limited to 'japanese/canna-lib/files/patch-ac')
| -rw-r--r-- | japanese/canna-lib/files/patch-ac | 189 |
1 files changed, 74 insertions, 115 deletions
diff --git a/japanese/canna-lib/files/patch-ac b/japanese/canna-lib/files/patch-ac index 306b6a0c5938..07d73f0cf670 100644 --- a/japanese/canna-lib/files/patch-ac +++ b/japanese/canna-lib/files/patch-ac @@ -1,115 +1,74 @@ -*** Canna.conf.orig Wed Apr 12 22:15:03 1995 ---- Canna.conf Thu Oct 31 13:47:39 1996 -*************** -*** 114,128 **** - * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $ - */ - -! 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 - -! ErrDir = /usr/spool/canna -! LockDir = /usr/spool/canna/lock - - wcharDefinition = -DCANNA_WCHAR - Wlib = ---- 114,128 ---- - * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $ - */ - -! cannaBinDir = ${PREFIX}/bin -! cannaSrvDir = ${PREFIX}/sbin -! cannaLibDir = ${PREFIX}/lib/canna -! cannaManDir = ${PREFIX}/man -! cannaIncDir = ${PREFIX}/include/canna -! libCannaDir = ${PREFIX}/lib - -! ErrDir = /var/log -! LockDir = /var/run - - wcharDefinition = -DCANNA_WCHAR - Wlib = -*************** -*** 135,141 **** - - pointerIntegerDef = - -! cannaDsoRev = 1 - sharedLibExtension = so.$(cannaDsoRev) - - /* 以下の３つは root にならないでインストールするのであれば echo に ---- 135,141 ---- - - pointerIntegerDef = - -! cannaDsoRev = 1.0 - sharedLibExtension = so.$(cannaDsoRev) - - /* 以下の３つは root にならないでインストールするのであれば echo に -*************** -*** 145,151 **** - CHMOD = chmod - - /* 日本語マニュアルを使わないのであればコメントアウト */ -! #define JAPANESEMAN - - /* locale ディレクトリを持っている場合は以下を記述する */ - /* #define LOCALE_DIR /usr/lib/locale */ ---- 145,151 ---- - CHMOD = chmod - - /* 日本語マニュアルを使わないのであればコメントアウト */ -! /* #define JAPANESEMAN */ - - /* locale ディレクトリを持っている場合は以下を記述する */ - /* #define LOCALE_DIR /usr/lib/locale */ -*************** -*** 178,184 **** - #define UseInstalledLibCanna NO - - DicDir = $(cannaLibDir)/dic -! LockFile = .CANNALOCK - - #ifdef NeXT - #define NO_X_ENV ---- 178,184 ---- - #define UseInstalledLibCanna NO - - DicDir = $(cannaLibDir)/dic -! LockFile = Canna.pid - - #ifdef NeXT - #define NO_X_ENV -*************** -*** 311,323 **** - #endif - #define InstallLibManPageAliases(file,destdir,aliases) @@\ - install.man:: @@\ -! @(TMP=/tmp/tmp.$$$$; \ @@\ -! $(RM) $${TMP}; \ @@\ -! echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \ @@\ -! for i in aliases; do (set -x; \ @@\ -! $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\ -! done; \ @@\ -! $(RM) $${TMP}) - #ifndef MakeDirectoriesLong - #define MakeDirectoriesLong(step,dirs,owner,group) @@\ - step:: @@\ ---- 311,323 ---- - #endif - #define InstallLibManPageAliases(file,destdir,aliases) @@\ - install.man:: @@\ -! @(TMP=/tmp/tmp.$$$$; \ @@\ -! $(RM) $${TMP}; \ @@\ -! echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \ @@\ -! for i in aliases; do (set -x; \ @@\ -! $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\ -! done; \ @@\ -! $(RM) $${TMP}) - #ifndef MakeDirectoriesLong - #define MakeDirectoriesLong(step,dirs,owner,group) @@\ - step:: @@\ +--- Canna.conf.orig Wed Apr 12 22:15:03 1995 ++++ Canna.conf Fri Oct 17 23:05:25 1997 +@@ -114,15 +114,15 @@ + * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $ + */ + +-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}/lib/canna ++cannaManDir = ${PREFIX}/man ++cannaIncDir = ${PREFIX}/include/canna ++libCannaDir = ${PREFIX}/lib + +-ErrDir = /usr/spool/canna +-LockDir = /usr/spool/canna/lock ++ErrDir = /var/log ++LockDir = /var/run/canna + + wcharDefinition = -DCANNA_WCHAR + Wlib = +@@ -135,7 +135,7 @@ + + pointerIntegerDef = + +-cannaDsoRev = 1 ++cannaDsoRev = 1.0 + sharedLibExtension = so.$(cannaDsoRev) + + /* 以下の３つは root にならないでインストールするのであれば echo に +@@ -145,7 +145,7 @@ + CHMOD = chmod + + /* 日本語マニュアルを使わないのであればコメントアウト */ +-#define JAPANESEMAN ++/* #define JAPANESEMAN */ + + /* locale ディレクトリを持っている場合は以下を記述する */ + /* #define LOCALE_DIR /usr/lib/locale */ +@@ -178,7 +178,7 @@ + #define UseInstalledLibCanna NO + + DicDir = $(cannaLibDir)/dic +-LockFile = .CANNALOCK ++LockFile = Canna.pid + + #ifdef NeXT + #define NO_X_ENV +@@ -311,13 +311,13 @@ + #endif + #define InstallLibManPageAliases(file,destdir,aliases) @@\ + install.man:: @@\ +- @(TMP=/tmp/tmp.$$$$; \ @@\ +- $(RM) $${TMP}; \ @@\ +- echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \ @@\ +- for i in aliases; do (set -x; \ @@\ +- $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\ +- done; \ @@\ +- $(RM) $${TMP}) ++ @(TMP=/tmp/tmp.$$$$; \ @@\ ++ $(RM) $${TMP}; \ @@\ ++ echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \ @@\ ++ for i in aliases; do (set -x; \ @@\ ++ $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\ ++ done; \ @@\ ++ $(RM) $${TMP}) + #ifndef MakeDirectoriesLong + #define MakeDirectoriesLong(step,dirs,owner,group) @@\ + step:: @@\ |