diff -rc dic-org/Makefile.SUN dic-unix/Makefile.SUN
*** dic-org/Makefile.SUN	Sat Jun 26 22:05:47 1993
--- dic-unix/Makefile.SUN	Thu Jun 24 19:34:15 1993
***************
*** 0 ****
--- 1,26 ----
+ CC = gcc
+ CFLAGS = -O -DEUC -DUNIX -DCD_ROM=\"/dev/sr0\"
+ BINDIR = /usr/local/bin
+ MANDIR = /usr/man/cat1
+ 
+ OBJ1 = main.o catalog.o cdio.o cmds.o
+ OBJ2 = dic.o dicget.o dicinit.o diclib.o
+ OBJ3 = gaiji.o getopt.o lib.o scrn.o 
+ OBJS = $(OBJ1) $(OBJ2) $(OBJ3)
+ 
+ PROG = dic
+ 
+ $(PROG)		:	$(OBJS) 
+ 	gcc -g -o $(PROG) $(OBJS) -lcurses -ltermcap
+ 
+ .c.o		:
+ 	$(CC) $(CFLAGS) -c $<
+ 
+ install : $(PROG)
+ 	install -c -m 777 $(PROG) $(BINDIR)
+ 
+ clean ::
+ 	rm -f *.o $(PROG) *~
+ 
+ man : dic.man 
+ 	cp dic.man $(MANDIR)/dic.1
diff -rc dic-org/Makefile.linux dic-unix/Makefile.linux
*** dic-org/Makefile.linux	Sat Jun 26 22:05:55 1993
--- dic-unix/Makefile.linux	Thu Jun 24 20:10:31 1993
***************
*** 0 ****
--- 1,27 ----
+ CC = gcc
+ CFLAGS = -O -DEUC -DUNIX -DCD_ROM=\"/dev/cdrom\"
+ BINDIR = /usr/local/bin
+ MANDIR = /usr/man/cat1
+ 
+ OBJ1 = main.o catalog.o cdio.o cmds.o
+ OBJ2 = dic.o dicget.o dicinit.o diclib.o
+ OBJ3 = gaiji.o getopt.o lib.o scrn.o 
+ OBJS = $(OBJ1) $(OBJ2) $(OBJ3)
+ 
+ PROG = dic
+ 
+ $(PROG)		:	$(OBJS) 
+ 	gcc -g -o $(PROG) $(OBJS) -lcurses -ltermcap
+ 
+ .c.o		:
+ 	$(CC) $(CFLAGS) -c $<
+ 
+ install : $(PROG)
+ 	install -c -m 777 $(PROG) $(BINDIR)
+ 
+ clean ::
+ 	rm -f *.o $(PROG) *~
+ 
+ man : dic.man 
+ 	cp dic.man $(MANDIR)/dic.1
+ 
diff -rc dic-org/dic.c dic-unix/dic.c
*** dic-org/dic.c	Tue May 18 14:55:30 1993
--- dic-unix/dic.c	Sat Jun 26 22:00:08 1993
***************
*** 503,516 ****
  
      str_word(key_org, str);
      index_ptr = key_index(key_org);
-     make_key(key_buf, key_org);
  
-     if ( ch == 0x2127 )
- 	index_tab_init(bs, mx);
- 
      if ( index_ptr == NULL )
  	return ERR;
  
  #ifdef	DEBUG
      put_jis(key_org, 256); putchar('\n');
      put_jis(key_buf, 256); putchar('\n');
--- 503,516 ----
  
      str_word(key_org, str);
      index_ptr = key_index(key_org);
  
      if ( index_ptr == NULL )
  	return ERR;
  
+     make_key(key_buf, key_org);
+ 
+     if ( ch == 0x2127 )
+ 	index_tab_init(bs, mx);
  #ifdef	DEBUG
      put_jis(key_org, 256); putchar('\n');
      put_jis(key_buf, 256); putchar('\n');
diff -rc dic-org/main.c dic-unix/main.c
*** dic-org/main.c	Tue May 18 15:22:36 1993
--- dic-unix/main.c	Thu Jun 24 17:45:37 1993
***************
*** 107,117 ****
  
      setbuf(stdout, iobuffer);
  #endif
! 
  #ifdef	UNIX
      cols_lines_get(&cols_max, &lines_max);
  #endif
! 
      ext_env_opt(&ac, &av, "DICOPT");
      program_name = progname(av[0]);
  
--- 107,117 ----
  
      setbuf(stdout, iobuffer);
  #endif
! /*
  #ifdef	UNIX
      cols_lines_get(&cols_max, &lines_max);
  #endif
! */
      ext_env_opt(&ac, &av, "DICOPT");
      program_name = progname(av[0]);