*** ./Makefile.ORIG	Fri Feb  4 10:37:52 2011
--- ./Makefile	Fri Feb  4 10:49:24 2011
***************
*** 25,31 ****
  
  include version.mk
  
! CC		= gcc
  CPP		= cpp
  CPP_FLAGS_POD	= ALL
  STRIP		= strip
--- 25,31 ----
  
  include version.mk
  
! CC		= cc -qcpluscmt
  CPP		= cpp
  CPP_FLAGS_POD	= ALL
  STRIP		= strip
***************
*** 53,59 ****
  LINK		= ln -sf
  LINK_MAN	= $(LINK)
  
! prefix		= /usr
  exec_prefix	= $(prefix)
  bindir		= $(exec_prefix)/bin
  datarootdir	= $(prefix)/share
--- 53,59 ----
  LINK		= ln -sf
  LINK_MAN	= $(LINK)
  
! prefix		= /opt/freeware
  exec_prefix	= $(prefix)
  bindir		= $(exec_prefix)/bin
  datarootdir	= $(prefix)/share
***************
*** 62,68 ****
  docsubdir	= $(PACKAGE)-$(DOS2UNIX_VERSION)
  docdir		= $(datarootdir)/doc/$(docsubdir)
  localedir	= $(datarootdir)/locale
! mandir		= $(datarootdir)/man
  man1dir		= $(mandir)/man1
  manext		= .1
  man1ext		= .1
--- 62,68 ----
  docsubdir	= $(PACKAGE)-$(DOS2UNIX_VERSION)
  docdir		= $(datarootdir)/doc/$(docsubdir)
  localedir	= $(datarootdir)/locale
! mandir		= $(prefix)/man
  man1dir		= $(mandir)/man1
  manext		= .1
  man1ext		= .1
***************
*** 97,103 ****
  
  # ......................................................... OS flags ...
  
! OS =
  
  ifndef OS
  ifneq (, $(wildcard /boot/vmlinuz*))
--- 97,103 ----
  
  # ......................................................... OS flags ...
  
! OS = aix
  
  ifndef OS
  ifneq (, $(wildcard /boot/vmlinuz*))
***************
*** 165,170 ****
--- 165,178 ----
  	EXTRA_DEFS += -Dhpux -D_HPUX_SOURCE
  endif
  
+ ifeq (aix,$(OS))
+ 	# Running under AIX
+ ifdef ENABLE_NLS
+ 	CFLAGS_OS     = -I/opt/freeware/include
+ 	LDFLAGS_EXTRA = -L/opt/freeware/lib -lintl
+ endif
+ endif
+ 
  ifndef OS
  	OS = unknown
  endif
***************
*** 204,210 ****
  
  # ............................................................ flags ...
  
! CFLAGS	= -O2 -Wall $(RPM_OPT_FLAGS)
  
  EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
  		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
--- 204,210 ----
  
  # ............................................................ flags ...
  
! CFLAGS	= -O -D_LARGE_FILES
  
  EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
  		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
***************
*** 329,342 ****
  	  bin/$(MAC2UNIX_BIN) \
  	  bin/$(UNIX2DOS_BIN) \
  	  bin/$(UNIX2MAC_BIN) \
! 	  share/man/man1/$(PACKAGE).1 \
! 	  share/man/man1/$(MAC2UNIX).1 \
! 	  share/man/man1/$(UNIX2DOS).1 \
! 	  share/man/man1/$(UNIX2MAC).1 \
! 	  share/man/*/man1/$(PACKAGE).1 \
! 	  share/man/*/man1/$(MAC2UNIX).1 \
! 	  share/man/*/man1/$(UNIX2DOS).1 \
! 	  share/man/*/man1/$(UNIX2MAC).1 \
  	  share/doc/$(docsubdir) \
  	  $(ZIPOBJ_EXTRA)
  
--- 337,350 ----
  	  bin/$(MAC2UNIX_BIN) \
  	  bin/$(UNIX2DOS_BIN) \
  	  bin/$(UNIX2MAC_BIN) \
! 	  man/man1/$(PACKAGE).1 \
! 	  man/man1/$(MAC2UNIX).1 \
! 	  man/man1/$(UNIX2DOS).1 \
! 	  man/man1/$(UNIX2MAC).1 \
! 	  man/*/man1/$(PACKAGE).1 \
! 	  man/*/man1/$(MAC2UNIX).1 \
! 	  man/*/man1/$(UNIX2DOS).1 \
! 	  man/*/man1/$(UNIX2MAC).1 \
  	  share/doc/$(docsubdir) \
  	  $(ZIPOBJ_EXTRA)
  
***************
*** 352,371 ****
  
  dist-zip:
  	rm -f $(prefix)/$(ZIPFILE)
! 	cd $(prefix) ; unix2dos share/doc/$(docsubdir)/*.txt share/man/man1/$(PACKAGE).1 share/man/man1/$(MAC2UNIX).1 share/man/man1/$(UNIX2DOS).1 share/man/man1/$(UNIX2MAC).1
! 	cd $(prefix) ; unix2dos share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
  	cd $(prefix) ; zip -r $(ZIPFILE) $(ZIPOBJ)
  	mv -f $(prefix)/$(ZIPFILE) ..
  
  dist-tgz:
! 	cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt share/man/man1/$(PACKAGE).1 share/man/man1/$(MAC2UNIX).1 share/man/man1/$(UNIX2DOS).1 share/man/man1/$(UNIX2MAC).1
! 	cd $(prefix) ; dos2unix share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
  	cd $(prefix) ; tar cvzf $(TGZFILE) $(ZIPOBJ)
  	mv $(prefix)/$(TGZFILE) ..
  
  dist-tbz:
! 	cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt share/man/man1/$(PACKAGE).1 share/man/man1/$(MAC2UNIX).1 share/man/man1/$(UNIX2DOS).1 share/man/man1/$(UNIX2MAC).1
! 	cd $(prefix) ; dos2unix share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
  	cd $(prefix) ; tar cvjf $(TBZFILE) $(ZIPOBJ)
  	mv $(prefix)/$(TBZFILE) ..
  
--- 360,379 ----
  
  dist-zip:
  	rm -f $(prefix)/$(ZIPFILE)
! 	cd $(prefix) ; unix2dos share/doc/$(docsubdir)/*.txt man/man1/$(PACKAGE).1 man/man1/$(MAC2UNIX).1 man/man1/$(UNIX2DOS).1 man/man1/$(UNIX2MAC).1
! 	cd $(prefix) ; unix2dos man/*/man1/$(PACKAGE).1 man/*/man1/$(MAC2UNIX).1 man/*/man1/$(UNIX2DOS).1 man/*/man1/$(UNIX2MAC).1
  	cd $(prefix) ; zip -r $(ZIPFILE) $(ZIPOBJ)
  	mv -f $(prefix)/$(ZIPFILE) ..
  
  dist-tgz:
! 	cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt man/man1/$(PACKAGE).1 man/man1/$(MAC2UNIX).1 man/man1/$(UNIX2DOS).1 man/man1/$(UNIX2MAC).1
! 	cd $(prefix) ; dos2unix man/*/man1/$(PACKAGE).1 man/*/man1/$(MAC2UNIX).1 man/*/man1/$(UNIX2DOS).1 man/*/man1/$(UNIX2MAC).1
  	cd $(prefix) ; tar cvzf $(TGZFILE) $(ZIPOBJ)
  	mv $(prefix)/$(TGZFILE) ..
  
  dist-tbz:
! 	cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt man/man1/$(PACKAGE).1 man/man1/$(MAC2UNIX).1 man/man1/$(UNIX2DOS).1 man/man1/$(UNIX2MAC).1
! 	cd $(prefix) ; dos2unix man/*/man1/$(PACKAGE).1 man/*/man1/$(MAC2UNIX).1 man/*/man1/$(UNIX2DOS).1 man/*/man1/$(UNIX2MAC).1
  	cd $(prefix) ; tar cvjf $(TBZFILE) $(ZIPOBJ)
  	mv $(prefix)/$(TBZFILE) ..
  
*** ./dos2unix.h.ORIG	Fri Feb  4 10:45:13 2011
--- ./dos2unix.h	Fri Feb  4 10:45:48 2011
***************
*** 28,34 ****
   *  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
! #ifdef __GNUC__
  #ifndef strcmpi
  #  define strcmpi(s1, s2) strcasecmp(s1, s2)
  #endif
--- 28,34 ----
   *  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
! #if defined(__GNUC__) || defined(_AIX51)
  #ifndef strcmpi
  #  define strcmpi(s1, s2) strcasecmp(s1, s2)
  #endif
*** ./unix2dos.h.ORIG	Fri Feb  4 10:46:30 2011
--- ./unix2dos.h	Fri Feb  4 10:46:46 2011
***************
*** 30,36 ****
  #define __UNIX2DOS_H
  
  
! #ifdef __GNUC__
  #ifndef strcmpi
  #  define strcmpi(s1, s2) strcasecmp(s1, s2)
  #endif
--- 30,36 ----
  #define __UNIX2DOS_H
  
  
! #if defined(__GNUC__) || defined(_AIX51)
  #ifndef strcmpi
  #  define strcmpi(s1, s2) strcasecmp(s1, s2)
  #endif