*** ./Makefile.ORIG	Thu Sep  6 21:17:00 2012
--- ./Makefile	Sat Sep 15 13:22:32 2012
***************
*** 36,42 ****
  include version.mk
  
  
! CC		= gcc
  CPP		= cpp
  CPP_FLAGS_POD	= ALL
  STRIP		= strip
--- 36,42 ----
  include version.mk
  
  
! CC		= cc -qcpluscmt
  CPP		= cpp
  CPP_FLAGS_POD	= ALL
  STRIP		= strip
***************
*** 66,72 ****
  LINK		= ln -sf
  LINK_MAN	= $(LINK)
  
! prefix		= /usr
  exec_prefix	= $(prefix)
  bindir		= $(exec_prefix)/bin
  datarootdir	= $(prefix)/share
--- 66,72 ----
  LINK		= ln -sf
  LINK_MAN	= $(LINK)
  
! prefix		= /opt/freeware
  exec_prefix	= $(prefix)
  bindir		= $(exec_prefix)/bin
  datarootdir	= $(prefix)/share
***************
*** 75,81 ****
  docsubdir	= $(PACKAGE)-$(DOS2UNIX_VERSION)
  docdir		= $(datarootdir)/doc/$(docsubdir)
  localedir	= $(datarootdir)/locale
! mandir		= $(datarootdir)/man
  man1dir		= $(mandir)/man1
  manext		= .1
  man1ext		= .1
--- 75,81 ----
  docsubdir	= $(PACKAGE)-$(DOS2UNIX_VERSION)
  docdir		= $(datarootdir)/doc/$(docsubdir)
  localedir	= $(datarootdir)/locale
! mandir		= $(prefix)/man
  man1dir		= $(mandir)/man1
  manext		= .1
  man1ext		= .1
***************
*** 117,123 ****
  
  # ......................................................... OS flags ...
  
! D2U_OS =
  
  ifndef D2U_OS
  ifeq (Linux, $(shell uname -s))
--- 117,123 ----
  
  # ......................................................... OS flags ...
  
! D2U_OS = aix
  
  ifndef D2U_OS
  ifeq (Linux, $(shell uname -s))
***************
*** 250,255 ****
--- 250,263 ----
  	EXTRA_DEFS += -Dhpux -D_HPUX_SOURCE
  endif
  
+ ifeq (aix,$(D2U_OS))
+       # Running under AIX
+ ifdef ENABLE_NLS
+       CFLAGS_OS     = -I/opt/freeware/include
+       LDFLAGS_EXTRA = -L/opt/freeware/lib -lintl
+ endif
+ endif
+ 
  ifndef D2U_OS
  	D2U_OS = $(shell uname -s)
  endif
***************
*** 264,270 ****
  endif
  
  CFLAGS_USER	=
! CFLAGS		= -O2 -Wall $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER)
  
  EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
  		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
--- 272,278 ----
  endif
  
  CFLAGS_USER	=
! CFLAGS		= -O2 $(CPPFLAGS) $(CFLAGS_USER) -D_LARGE_FILES
  
  EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
  		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
***************
*** 289,295 ****
  endif
  
  LDFLAGS_USER	=
! LDFLAGS = $(RPM_OPT_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER)
  
  DEFS_USER	=
  DEFS		= $(EXTRA_DEFS) $(DEFS_USER)
--- 297,303 ----
  endif
  
  LDFLAGS_USER	=
! LDFLAGS = $(LDFLAGS_EXTRA) $(LDFLAGS_USER)
  
  DEFS_USER	=
  DEFS		= $(EXTRA_DEFS) $(DEFS_USER)
***************
*** 507,520 ****
  	  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)
  
--- 515,528 ----
  	  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)
  
*** ./common.h.ORIG	Sat Sep 15 13:22:50 2012
--- ./common.h	Sat Sep 15 13:23:22 2012
***************
*** 65,71 ****
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
! #ifdef __GNUC__
  #ifndef strcmpi
  #  include <strings.h>
  #  define strcmpi(s1, s2) strcasecmp(s1, s2)
--- 65,71 ----
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
! #if defined(__GNUC__) || defined(_AIX51)
  #ifndef strcmpi
  #  include <strings.h>
  #  define strcmpi(s1, s2) strcasecmp(s1, s2)