AIDA Shinra
aida-****@jcom*****
2002年 12月 14日 (土) 13:53:20 JST
相田です。
>すみません、「修正を含めて」というのは、CVSのDownload tarballをDownload
>すれば含まれていると思っていいのでしょうか？
それだとHEADそのものを取り出すことになります。
cvs rdiffで変更点を取り出して、関係ない部分を削るのが正解です。
cvs rdiff -u -kk -D '2002/11/04 16:51 UTC' -D '2002/11/04 16:53
UTC' canna>destdir.diff
cvs rdiff -u -kk -D '2002/11/09 JST' -D '2002/11/10 JST'
canna>>destdir.diff
で取り出して、編集したものを付けておきます。
もっとも、細かい変更がたまってきたので、そろそろ3.6p2を出した方がいい
かなあ、という気もしますが。
>それで、cannakillが/usr/binにcatdicのシンボリックリンクとしてできてしまっ
>ています。
/var/tmp/usr/binに入れたいという意味ですか？それならDESTDIRを付けるだ
けで大丈夫だと思うのですが。
Index: canna/cmd/catdic/Imakefile
diff -u canna/cmd/catdic/Imakefile:1.2 canna/cmd/catdic/Imakefile:1.3
--- canna/cmd/catdic/Imakefile:1.2 Sun Oct 20 13:10:25 2002
+++ canna/cmd/catdic/Imakefile Tue Nov 5 01:52:05 2002
@@ -53,45 +53,46 @@
#if defined(__EMX__) || defined(__CYGWIN32__)
install::
- $(RM) $(cannaBinDir)/cpdic.exe
- $(RM) $(cannaBinDir)/lsdic.exe
- $(RM) $(cannaBinDir)/mkdic.exe
- $(RM) $(cannaBinDir)/mvdic.exe
- $(RM) $(cannaBinDir)/rmdic.exe
- $(RM) $(cannaBinDir)/syncdic.exe
- $(RM) $(cannaBinDir)/chmoddic.exe
- $(RM) $(cannaBinDir)/addwords.exe
- $(RM) $(cannaBinDir)/delwords.exe
- $(RM) $(cannaBinDir)/cannakill.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cpdic.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/lsdic.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/mkdic.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/mvdic.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/rmdic.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/syncdic.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/chmoddic.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/addwords.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/delwords.exe
- $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cannakill.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/cpdic.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/lsdic.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/mkdic.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/mvdic.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/rmdic.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/syncdic.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/chmoddic.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/addwords.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/delwords.exe
+ $(RM) $(DESTDIR)$(cannaBinDir)/cannakill.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cpdic.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/lsdic.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mkdic.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mvdic.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/rmdic.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/syncdic.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/chmoddic.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/addwords.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/delwords.exe
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cannakill.exe
#else
install::
- $(RM) $(cannaBinDir)/cpdic
- $(RM) $(cannaBinDir)/lsdic
- $(RM) $(cannaBinDir)/mkdic
- $(RM) $(cannaBinDir)/mvdic
- $(RM) $(cannaBinDir)/rmdic
- $(RM) $(cannaBinDir)/syncdic
- $(RM) $(cannaBinDir)/chmoddic
- $(RM) $(cannaBinDir)/addwords
- $(RM) $(cannaBinDir)/delwords
- $(RM) $(cannaBinDir)/cannakill
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mvdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/rmdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
+ $(RM) $(DESTDIR)$(cannaBinDir)/cpdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/lsdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/mkdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/mvdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/rmdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/syncdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
+ $(RM) $(DESTDIR)$(cannaBinDir)/addwords
+ $(RM) $(DESTDIR)$(cannaBinDir)/delwords
+ $(RM) $(DESTDIR)$(cannaBinDir)/cannakill
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mvdic
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/rmdic
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/syncdic
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/chmoddic
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
+ $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
#endif
Index: canna/dic/ideo/words/Imakefile
diff -u canna/dic/ideo/words/Imakefile:1.2 canna/dic/ideo/words/Imakefile:1.3
--- canna/dic/ideo/words/Imakefile:1.2 Sun Oct 20 13:10:29 2002
+++ canna/dic/ideo/words/Imakefile Tue Nov 5 01:52:05 2002
@@ -69,13 +69,13 @@
#endif
install::
- $(CHGRP) $(cannaGroup) $(CANNADICDIR)
- $(CHOWN) $(cannaOwner) $(CANNADICDIR)
- $(CHMOD) ug+w $(CANNADICDIR)
- $(CHGRP) $(cannaGroup) $(DicDir)
- $(CHOWN) $(cannaOwner) $(DicDir)
- $(CHMOD) ug+w $(DicDir)
- $(CHMOD) -w $(CANNADICDIR)/dics.dir
+ $(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
+ $(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
+ $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
+ $(CHGRP) $(cannaGroup) $(DESTDIR)$(DicDir)
+ $(CHOWN) $(cannaOwner) $(DESTDIR)$(DicDir)
+ $(CHMOD) ug+w $(DESTDIR)$(DicDir)
+ $(CHMOD) -w $(DESTDIR)$(CANNADICDIR)/dics.dir
#ifndef USE_OBSOLETE_STYLE_FILENAME
InstallNamedNonExec(necgaiji.t,necgaiji.ctd,$(CANNADICDIR))
@@ -88,6 +88,10 @@
InstallNamedNonExec(number.t,number.ctd,$(CANNADICDIR))
InstallNamedNonExec(katakana.t,katakana.ctd,$(CANNADICDIR))
InstallNamedNonExec(keishiki.t,keishiki.ctd,$(CANNADICDIR))
+
+install::
+ cd $(DESTDIR)$(CANNADICDIR) ; $(CHMOD) 0664 *.ctd ;\
+ $(CHOWN) $(cannaOwner) *.ctd ; $(CHGRP) $(cannaGroup) *.ctd
#else
TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \
hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t
Index: canna/lib/RK/Imakefile
diff -u canna/lib/RK/Imakefile:1.1 canna/lib/RK/Imakefile:1.2
--- canna/lib/RK/Imakefile:1.1 Sat Oct 19 17:27:44 2002
+++ canna/lib/RK/Imakefile Tue Nov 5 01:52:06 2002
@@ -31,7 +31,7 @@
LinkFileList(includes,RKrename.h,$(CANNAROOT)/include,../lib/RK)
InstallMultiple($(HEADER),$(cannaIncDir))
-InstallLibManPageLong(RkBgnBun,$(cannaManDir),RkRgnBun)
+InstallLibManPageLong(RkBgnBun,$(cannaManDir),RkBgnBun)
InstallLibManPageLong(RkDefine,$(cannaManDir),RkDefineDic)
InstallLibManPageLong(RkDelete,$(cannaManDir),RkDeleteDic)
InstallLibManPageLong(RkEndBun,$(cannaManDir),RkEndBun)
Index: canna/cmd/catdic/Imakefile
diff -u canna/cmd/catdic/Imakefile:1.3 canna/cmd/catdic/Imakefile:1.4
--- canna/cmd/catdic/Imakefile:1.3 Tue Nov 5 01:52:05 2002
+++ canna/cmd/catdic/Imakefile Sat Nov 9 16:16:45 2002
@@ -63,16 +63,16 @@
$(RM) $(DESTDIR)$(cannaBinDir)/addwords.exe
$(RM) $(DESTDIR)$(cannaBinDir)/delwords.exe
$(RM) $(DESTDIR)$(cannaBinDir)/cannakill.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cpdic.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/lsdic.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mkdic.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mvdic.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/rmdic.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/syncdic.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/chmoddic.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/addwords.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/delwords.exe
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cannakill.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/cpdic.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/lsdic.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/mkdic.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/mvdic.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/rmdic.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/syncdic.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/chmoddic.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/addwords.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/delwords.exe
+ $(LN) catdic.exe $(DESTDIR)$(cannaBinDir)/cannakill.exe
#else
install::
$(RM) $(DESTDIR)$(cannaBinDir)/cpdic
@@ -85,14 +85,14 @@
$(RM) $(DESTDIR)$(cannaBinDir)/addwords
$(RM) $(DESTDIR)$(cannaBinDir)/delwords
$(RM) $(DESTDIR)$(cannaBinDir)/cannakill
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mvdic
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/rmdic
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/syncdic
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/chmoddic
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
- $(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/cpdic
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/lsdic
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/mkdic
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/mvdic
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/rmdic
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/syncdic
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/chmoddic
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/addwords
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/delwords
+ $(LN) catdic $(DESTDIR)$(cannaBinDir)/cannakill
#endif
Index: canna/dic/ideo/grammar/Imakefile
diff -u canna/dic/ideo/grammar/Imakefile:1.1 canna/dic/ideo/grammar/Imakefile:1.2
--- canna/dic/ideo/grammar/Imakefile:1.1 Sat Oct 19 17:27:34 2002
+++ canna/dic/ideo/grammar/Imakefile Sat Nov 9 13:54:11 2002
@@ -85,6 +85,6 @@
InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
install::
- $(CHGRP) $(cannaGroup) $(CANNADICDIR)
- $(CHOWN) $(cannaOwner) $(CANNADICDIR)
- $(CHMOD) ug+w $(CANNADICDIR)
+ $(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
+ $(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
+ $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)