Wnn6-SDK-config.patch

   1 diff -ruN src.org/contrib/im/Xsi/Wnn/include/config.h src/contrib/im/Xsi/Wnn/include/config.h
   2 --- src.org/contrib/im/Xsi/Wnn/include/config.h Wed Oct 28 13:36:24 1998
   3 +++ src/contrib/im/Xsi/Wnn/include/config.h     Wed Jan 27 11:36:40 1999
   4 @@ -140,7 +140,7 @@
   5  #define _CONFIG_H_
   6
   7  #ifndef        LIBDIR
   8 -#define        LIBDIR          "/usr/local/lib/wnn6"
   9 +#define        LIBDIR          "/var/lib/wnn6"
  10  #endif /* LIBDIR */
  11
  12  #ifdef TAIWANESE
  13 diff -ruN src.org/contrib/im/Xsi/config/X11.tmpl src/contrib/im/Xsi/config/X11.tmpl
  14 --- src.org/contrib/im/Xsi/config/X11.tmpl      Wed Oct 28 13:36:37 1998
  15 +++ src/contrib/im/Xsi/config/X11.tmpl  Wed Jan 27 11:36:14 1999
  16 @@ -7,9 +7,9 @@
  17  #include "/usr/openwin/lib/config/Project.tmpl"
  18  #else  /* Sun & SVR4 */
  19  #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture)
  20 -#include "/usr/X11R6/lib/X11/config/X11.tmpl"
  21 +#include "/usr/lib64/X11/config/X11.tmpl"
  22  #else  /* Linux || *BSD */
  23 -#include "/usr/lib/X11/config/Project.tmpl"
  24 +#include "/usr/lib64/X11/config/Project.tmpl"
  25  #endif /* Linux || *BSD */
  26  #endif /* Sun & SVR4 */
  27
  28 @@ -60,9 +60,9 @@
  29  #define BinDir Concat(ProjectRoot,/bin)
  30  #else
  31  #if ((defined LINUX) || (defined FREEBSD) || (defined BSDOS) || (defined NETBSD))
  32 -#define BinDir /usr/X11R6/bin
  33 +#define BinDir /usr/bin
  34  #else
  35 -#define BinDir /usr/bin/X11
  36 +#define BinDir /usr/bin
  37  #endif /* LINUX || FREEBSD || BSDOS || NETBSD */
  38  #endif /* ProjectRoot */
  39  #endif /* BinDir */
  40 @@ -73,7 +73,7 @@
  41  #define BuildIncTop ..         /* relative to $(TOP)/X11 */
  42  #endif
  43  #ifndef LibDir
  44 -#define LibDir $(USRLIBDIR)/X11
  45 +#define LibDir $(USRLIBDIR)
  46  #endif
  47  #ifndef ConfigDir
  48  #define ConfigDir $(LIBDIR)/config
  49 @@ -502,32 +502,36 @@
  50  #define WnnOwner       wnn
  51  #endif
  52
  53 +#ifndef InstallHeader
  54 +#define InstallHeader YES
  55 +#endif
  56 +
  57  #ifndef ImTop
  58  #define ImTop  $(CONTRIBSRC)/im/Xsi
  59  #endif
  60
  61  #ifndef WnnWnnDir
  62 -#define WnnWnnDir      /usr/local/lib/wnn6
  63 +#define WnnWnnDir      /var/lib/wnn6
  64  #endif
  65
  66
  67  #ifndef WnnBinDir
  68 -#define WnnBinDir      /usr/local/bin
  69 +#define WnnBinDir      /usr/bin
  70  #endif
  71
  72  #ifndef WnnIncDir
  73  #define WnnIncDir      $(INCROOT)
  74  #endif
  75
  76  #ifndef WnnLibDir
  77  #define WnnLibDir      $(USRLIBDIR)
  78  #endif
  79
  80         WNNOWNER = WnnOwner
  81            IMTOP = ImTop
  82        WNNWNNDIR = WnnWnnDir
  83        WNNBINDIR = WnnBinDir
  84 -      WNNINCDIR = WnnIncRoot
  85 +      WNNINCDIR = WnnIncDir
  86        WNNLIBDIR = WnnLibDir
  87
  88      WNNTERM_LIB = termLibrary
  89 @@ -539,7 +543,7 @@
  90       JWNNWNNDIR = $(WNNWNNDIR)/ja_JP
  91       JWNNBINDIR = $(WNNBINDIR)/Wnn6
  92
  93 -     JWNNINCDIR = $(WNNINCDIR)/wnn
  94 +     JWNNINCDIR = $(WNNINCDIR)/wnn6
  95       JWNNDICDIR = $(JWNNWNNDIR)/dic
  96    JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic
  97  JWNNWNNCONSDICDIR = $(JWNNDICDIR)/wnncons
  98 @@ -563,7 +567,7 @@
  99     WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir
 100      WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
 101       WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
 102 -        WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a
 103 +        WNNJLIB = $(WNNJLIBSRC)/libwnn6.a
 104       WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
 105
 106          CWNNTOP = $(IMTOP)/cWnn
 107 diff -ur src/contrib/im/Xsi/Makefile.ini src.new/contrib/im/Xsi/Makefile.ini
 108 --- src/contrib/im/Xsi/Makefile.ini     2011-07-14 11:38:14.915761854 +0200
 109 +++ src.new/contrib/im/Xsi/Makefile.ini 2011-07-14 11:31:20.392761947 +0200
 110 @@ -15,7 +15,7 @@
 111        CURRENT_DIR = ./../contrib/im/Xsi
 112  #       CONFIGSRC = /usr/lib/X11/config
 113  #       CONFIGSRC = /usr/openwin/lib/X11/config
 114 -        CONFIGSRC = /usr/X11R6/lib/X11/config
 115 +        CONFIGSRC = /usr/lib64/X11/config
 116           IMAKESRC = $(CONFIGSRC)
 117           IRULESRC = $(CONFIGSRC)
 118            WSFLAGS =
 119 --- src/contrib/im/Xsi/config/Project.tmpl~     2000-09-01 11:58:55.000000000 +0200
 120 +++ src/contrib/im/Xsi/config/Project.tmpl      2011-07-14 12:14:57.879151945 +0200
 121 @@ -7,9 +7,9 @@
 122  #include "/usr/openwin/lib/config/Project.tmpl"
 123  #else  /* Sun & SVR4 */
 124  #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture)
 125 -#include "/usr/X11R6/lib/X11/config/Project.tmpl"
 126 +#include "/usr/lib64/X11/config/Project.tmpl"
 127  #else  /* Linux || *BSD */
 128 -#include "/usr/lib/X11/config/Project.tmpl"
 129 +#include "/usr/lib64/X11/config/Project.tmpl"
 130  #endif /* Linux || *BSD */
 131  #endif /* Sun & SVR4 */
 132