Index: Kinput2.conf
diff -u Kinput2.conf:1.1.1.1 Kinput2.conf:1.2
--- Kinput2.conf:1.1.1.1	Wed Oct  5 10:18:12 1994
+++ Kinput2.conf	Mon May  1 06:53:32 1995
@@ -17,7 +17,7 @@
 
 /* #define UseWnn */	/* define if you are going to use Wnn */
 #define UseCanna	/* define if you are going to use Canna */
-#define UseSj3		/* define if you are going to use Sj3 */
+/* #define UseSj3	/* define if you are going to use Sj3 */
 
 
 XCOMM Wnn configuration
@@ -63,17 +63,17 @@
  * If you have already installed Canna header files and libraries..
  */
 XCOMM use installed headers/libraries
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
+CANNAINSTDIR = /usr/local/canna
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -L/usr/local/lib -lcanna16
 
 /*
  * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
  * but not installed yet..
  */
 XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
 
 
 XCOMM SJ3 configuration