RCS file: /Users/kono/src/CVS/unzip-5.52/unzpriv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** unzpriv.h	2005/04/14 08:45:17	1.1
--- unzpriv.h	2005/04/14 19:20:15	1.2
***************
*** 2415,2420 ****
--- 2415,2421 ----
  #  define foreign(c)  (c)
  #endif
  
+ #ifndef A_TO_N
  #ifndef native
  #  define native(c)   (c)
  #  define A_TO_N(str1)
***************
*** 2425,2430 ****
--- 2426,2436 ----
  #  define A_TO_N(str1) {register uch *p;\
       for (p=(uch *)(str1); *p; p++) *p=native(*p);}
  #endif
+ #else
+ #  define native(c)   (c)
+ extern void a_to_n(char *);
+ #endif
+ 
  /*
   *  Translate the zero-terminated string in str1 from ASCII to the native
   *  character set. The translation is performed in-place and uses the
Index: unix/Makefile
===================================================================
RCS file: /Users/kono/src/CVS/unzip-5.52/unix/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** Makefile	2005/04/14 08:45:18	1.1
--- Makefile	2005/04/14 19:20:21	1.2
***************
*** 43,49 ****
  
  # UnZip flags
  CC = cc#	try using "gcc" target rather than changing this (CC and LD
! LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
  AS = as
  LOC = $(LOCAL_UNZIP)
  AF = $(LOC)
--- 43,49 ----
  
  # UnZip flags
  CC = cc#	try using "gcc" target rather than changing this (CC and LD
! LD = $(CC) -g #	must match, else "unresolved symbol:  ___main" is possible)
  AS = as
  LOC = $(LOCAL_UNZIP)
  AF = $(LOC)
***************
*** 83,94 ****
  # object files
  OBJS1 = unzip$O $(CRC32)$O crctab$O crypt$O envargs$O explode$O
  OBJS2 = extract$O fileio$O globals$O inflate$O list$O match$O
! OBJS3 = process$O ttyio$O unreduce$O unshrink$O zipinfo$O
  OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $M$O
  LOBJS = $(OBJS)
  OBJSDLL = $(OBJS:.o=.pic.o) api.pic.o
  OBJX = unzipsfx$O $(CRC32)$O crctab_$O crypt_$O extract_$O fileio_$O \
! 	globals_$O inflate_$O match_$O process_$O ttyio_$O $M_$O
  LOBJX = $(OBJX)
  OBJF = funzip$O $(CRC32)$O cryptf$O globalsf$O inflatef$O ttyiof$O
  #OBJS_OS2 = $(OBJS1:.o=.obj) $(OBJS2:.o=.obj) os2.obj
--- 83,94 ----
  # object files
  OBJS1 = unzip$O $(CRC32)$O crctab$O crypt$O envargs$O explode$O
  OBJS2 = extract$O fileio$O globals$O inflate$O list$O match$O
! OBJS3 = process$O ttyio$O unreduce$O unshrink$O zipinfo$O utf8_name$O
  OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $M$O
  LOBJS = $(OBJS)
  OBJSDLL = $(OBJS:.o=.pic.o) api.pic.o
  OBJX = unzipsfx$O $(CRC32)$O crctab_$O crypt_$O extract_$O fileio_$O \
! 	globals_$O inflate_$O match_$O process_$O ttyio_$O $M_$O utf8_name$O
  LOBJX = $(OBJX)
  OBJF = funzip$O $(CRC32)$O cryptf$O globalsf$O inflatef$O ttyiof$O
  #OBJS_OS2 = $(OBJS1:.o=.obj) $(OBJS2:.o=.obj) os2.obj
***************
*** 411,416 ****
--- 411,418 ----
  unix.pic.o:	unix/unix.c $(UNZIP_H) unzvers.h		# Unix shlib
  	$(CC) -c $(CF) -o $@ unix/unix.c
  
+ utf8_name$O:	unix/utf8_name.c 
+ 	$(CC) -c $(CF) -o $@ unix/utf8_name.c 
  
  unix_make:
  #	@echo\
***************
*** 842,847 ****
--- 844,859 ----
  # Macintosh MacOS X (Unix-compatible enviroment), using gcc
  macosx_gcc:	unix_make
  	$(MAKE) unzips CC=gcc CF="-O3 -Wall -I. -DBSD -DUNIX $(LOC)" LF2=""
+ 	$(STRIP) $(UNZIPS)
+ 
+ # Macintosh MacOS X (Unix-compatible enviroment), utf8 conversion wich -g
+ macosx_nkf_g:	unix_make unix/utf8_name.c
+ 	$(MAKE) unzips CF="-g -Wall -I. -DA_TO_N=a_to_n -DMACOSX_NKF -DBSD -DUNIX $(LOC)" LF2=""
+ #	$(STRIP) $(UNZIPS)
+ 
+ # Macintosh MacOS X (Unix-compatible enviroment), utf8 conversion 
+ macosx_nkf:	unix_make unix/utf8_name.c
+ 	$(MAKE) unzips CF="-O3 -Wall -I. -DA_TO_N=a_to_n -DMACOSX_NKF -DBSD -DUNIX $(LOC)" LF2=""
  	$(STRIP) $(UNZIPS)
  
  # Minix 1.5 PC for the 386.  Invoke as is to use default cc, or as "make
