Canna-DESTDIR.patch

   1 diff -Nur Canna35b2.orig/Imakefile Canna35b2/Imakefile
   2 --- Canna35b2.orig/Imakefile    Wed Nov 27 08:01:34 1996
   3 +++ Canna35b2/Imakefile Sat Mar  9 19:07:17 2002
   4 @@ -31,13 +31,8 @@
   5
   6  MakeDirectories(mkbindir, $(cannaBinDir))
   7  MakeDirectories(mklibdir, $(cannaLibDir))
   8 -#ifdef __EMX__
   9  MakeDirectories(mkdicdir, $(DicDir))
  10  MakeDirectories(mkerrdir, $(ErrDir))
  11 -#else
  12 -MakeDirectoriesLong(mkdicdir, $(DicDir), $(cannaOwner), $(cannaGroup))
  13 -MakeDirectoriesLong(mkerrdir, $(ErrDir), $(cannaOwner), $(cannaGroup))
  14 -#endif
  15
  16  LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..)
  17
  18 diff -Nur Canna35b2.orig/cmd/catdic/Imakefile Canna35b2/cmd/catdic/Imakefile
  19 --- Canna35b2.orig/cmd/catdic/Imakefile Mon Dec  2 12:38:14 1996
  20 +++ Canna35b2/cmd/catdic/Imakefile      Sat Mar  9 19:02:25 2002
  21 @@ -75,23 +75,23 @@
  22         $(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cannakill.exe
  23  #else
  24  install::
  25 -       $(RM) $(cannaBinDir)/cpdic
  26 -       $(RM) $(cannaBinDir)/lsdic
  27 -       $(RM) $(cannaBinDir)/mkdic
  28 -       $(RM) $(cannaBinDir)/mvdic
  29 -       $(RM) $(cannaBinDir)/rmdic
  30 -       $(RM) $(cannaBinDir)/syncdic
  31 -       $(RM) $(cannaBinDir)/chmoddic
  32 -       $(RM) $(cannaBinDir)/addwords
  33 -       $(RM) $(cannaBinDir)/delwords
  34 -       $(RM) $(cannaBinDir)/cannakill
  35 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
  36 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
  37 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
  38 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mvdic
  39 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/rmdic
  40 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
  41 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
  42 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
  43 -       $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
  44 +       $(RM) $(DESTDIR)$(cannaBinDir)/cpdic
  45 +       $(RM) $(DESTDIR)$(cannaBinDir)/lsdic
  46 +       $(RM) $(DESTDIR)$(cannaBinDir)/mkdic
  47 +       $(RM) $(DESTDIR)$(cannaBinDir)/mvdic
  48 +       $(RM) $(DESTDIR)$(cannaBinDir)/rmdic
  49 +       $(RM) $(DESTDIR)$(cannaBinDir)/syncdic
  50 +       $(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
  51 +       $(RM) $(DESTDIR)$(cannaBinDir)/addwords
  52 +       $(RM) $(DESTDIR)$(cannaBinDir)/delwords
  53 +       $(RM) $(DESTDIR)$(cannaSrvDir)/cannakill
  54 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/cpdic
  55 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/lsdic
  56 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/mkdic
  57 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/mvdic
  58 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/rmdic
  59 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/syncdic
  60 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/addwords
  61 +       $(LN) catdic $(DESTDIR)$(cannaBinDir)/delwords
  62 +       $(LN) ../bin/catdic $(DESTDIR)$(cannaSrvDir)/cannakill
  63  #endif
  64 diff -Nur Canna35b2.orig/dic/ideo/grammar/Imakefile Canna35b2/dic/ideo/grammar/Imakefile
  65 --- Canna35b2.orig/dic/ideo/grammar/Imakefile   Wed Nov 27 08:14:45 1996
  66 +++ Canna35b2/dic/ideo/grammar/Imakefile        Sat Mar  9 19:05:52 2002
  67 @@ -82,9 +82,7 @@
  68
  69  MakeDirectories(install,$(CANNADICDIR))
  70
  71 -InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
  72 +InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664)
  73
  74  install::
  75 -       $(CHGRP) $(cannaGroup) $(CANNADICDIR)
  76 -       $(CHOWN) $(cannaOwner) $(CANNADICDIR)
  77 -       $(CHMOD) ug+w $(CANNADICDIR)
  78 +       $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
  79 diff -Nur Canna35b2.orig/dic/ideo/words/Imakefile Canna35b2/dic/ideo/words/Imakefile
  80 --- Canna35b2.orig/dic/ideo/words/Imakefile     Wed Nov 27 08:14:55 1996
  81 +++ Canna35b2/dic/ideo/words/Imakefile  Sat Mar  9 19:05:40 2002
  82 @@ -60,7 +60,7 @@
  83
  84  MakeDirectories(install,$(CANNADICDIR))
  85
  86 -InstallMultipleFlags($(TARGETS),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
  87 +InstallMultipleFlags($(TARGETS),$(CANNADICDIR),-m 0664)
  88
  89  #ifdef USE_OBSOLETE_STYLE_FILENAME
  90  InstallNamedNonExec(obsolete.dir,dics.dir,$(CANNADICDIR))
  91 @@ -69,13 +69,9 @@
  92  #endif
  93
  94  install::
  95 -       $(CHGRP) $(cannaGroup) $(CANNADICDIR)
  96 -       $(CHOWN) $(cannaOwner) $(CANNADICDIR)
  97 -       $(CHMOD) ug+w $(CANNADICDIR)
  98 -       $(CHGRP) $(cannaGroup) $(DicDir)
  99 -       $(CHOWN) $(cannaOwner) $(DicDir)
 100 -       $(CHMOD) ug+w $(DicDir)
 101 -       $(CHMOD) -w $(CANNADICDIR)/dics.dir
 102 +       $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
 103 +       $(CHMOD) ug+w $(DESTDIR)$(DicDir)
 104 +       $(CHMOD) -w $(DESTDIR)$(CANNADICDIR)/dics.dir
 105
 106  #ifndef USE_OBSOLETE_STYLE_FILENAME
 107  InstallNamedNonExec(necgaiji.t,necgaiji.ctd,$(CANNADICDIR))
 108 @@ -91,7 +87,7 @@
 109  #else
 110      TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \
 111                 hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t
 112 -InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
 113 +InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664)
 114  #endif
 115
 116  depend::
 117 diff -Nur Canna35b2.orig/server/Imakefile Canna35b2/server/Imakefile
 118 --- Canna35b2.orig/server/Imakefile     Wed Nov 27 08:25:24 1996
 119 +++ Canna35b2/server/Imakefile  Sat Mar  9 19:07:48 2002
 120 @@ -2,7 +2,7 @@
 121  #include "../Canna.conf"
 122
 123           CANNAROOT = ..
 124 -     INSTUGIDFLAGS = -m 6555 $(cannaOwnerGroup)
 125 +     INSTUGIDFLAGS = -m 755
 126  #ifdef __EMX__
 127           INSTFLAGS = $(INSTUGIDFLAGS)
 128     LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a