]>
Commit | Line | Data |
---|---|---|
a06aed1b JB |
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 | @@ -502,32 +502,36 @@ | |
17 | #define WnnOwner wnn | |
18 | #endif | |
19 | ||
20 | +#ifndef InstallHeader | |
21 | +#define InstallHeader YES | |
22 | +#endif | |
23 | + | |
24 | #ifndef ImTop | |
25 | #define ImTop $(CONTRIBSRC)/im/Xsi | |
26 | #endif | |
27 | ||
28 | #ifndef WnnWnnDir | |
29 | -#define WnnWnnDir /usr/local/lib/wnn6 | |
30 | +#define WnnWnnDir /var/lib/wnn6 | |
31 | #endif | |
32 | ||
33 | ||
34 | #ifndef WnnBinDir | |
35 | -#define WnnBinDir /usr/local/bin | |
36 | +#define WnnBinDir /usr/bin | |
37 | #endif | |
38 | ||
39 | #ifndef WnnIncDir | |
40 | -#define WnnIncDir $(INCROOT) | |
41 | +#define WnnIncDir /usr/include | |
42 | #endif | |
43 | ||
44 | #ifndef WnnLibDir | |
45 | -#define WnnLibDir $(USRLIBDIR) | |
46 | +#define WnnLibDir /usr/lib | |
47 | #endif | |
48 | ||
49 | WNNOWNER = WnnOwner | |
50 | IMTOP = ImTop | |
51 | WNNWNNDIR = WnnWnnDir | |
52 | WNNBINDIR = WnnBinDir | |
53 | - WNNINCDIR = WnnIncRoot | |
54 | + WNNINCDIR = WnnIncDir | |
55 | WNNLIBDIR = WnnLibDir | |
56 | ||
57 | WNNTERM_LIB = termLibrary | |
58 | @@ -539,7 +543,7 @@ | |
59 | JWNNWNNDIR = $(WNNWNNDIR)/ja_JP | |
60 | JWNNBINDIR = $(WNNBINDIR)/Wnn6 | |
61 | ||
62 | - JWNNINCDIR = $(WNNINCDIR)/wnn | |
63 | + JWNNINCDIR = $(WNNINCDIR)/wnn6 | |
64 | JWNNDICDIR = $(JWNNWNNDIR)/dic | |
65 | JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic | |
66 | JWNNWNNCONSDICDIR = $(JWNNDICDIR)/wnncons | |
67 | @@ -563,7 +567,7 @@ | |
68 | WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir | |
69 | WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) | |
70 | WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" | |
71 | - WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a | |
72 | + WNNJLIB = $(WNNJLIBSRC)/libwnn6.a | |
73 | WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a | |
74 | ||
75 | CWNNTOP = $(IMTOP)/cWnn |