*** ./common.h.ORIG Sat Sep 15 13:22:50 2012 --- ./common.h Sat Sep 15 13:23:22 2012 *************** *** 65,71 **** #include #include #include ! #ifdef __GNUC__ #ifndef strcmpi # include # define strcmpi(s1, s2) strcasecmp(s1, s2) --- 65,71 ---- #include #include #include ! #if defined(__GNUC__) || defined(_AIX51) #ifndef strcmpi # include # define strcmpi(s1, s2) strcasecmp(s1, s2) *** ./Makefile.ORIG Sat Nov 8 21:07:19 2014 --- ./Makefile Sat Nov 8 21:11:05 2014 *************** *** 39,46 **** .PRECIOUS: %.1 %.pod ! CC ?= gcc ! CPP ?= cpp CPP_FLAGS_POD = ALL STRIP = strip --- 39,46 ---- .PRECIOUS: %.1 %.pod ! CC = cc -qcpluscmt ! CPP = cpp CPP_FLAGS_POD = ALL STRIP = strip *************** *** 69,75 **** LINK = ln -sf LINK_MAN = $(LINK) ! prefix = /usr exec_prefix = $(prefix) bindir = $(exec_prefix)/bin datarootdir = $(prefix)/share --- 69,75 ---- LINK = ln -sf LINK_MAN = $(LINK) ! prefix = /opt/freeware exec_prefix = $(prefix) bindir = $(exec_prefix)/bin datarootdir = $(prefix)/share *************** *** 78,84 **** docsubdir = $(PACKAGE)-$(DOS2UNIX_VERSION) docdir = $(datarootdir)/doc/$(docsubdir) localedir = $(datarootdir)/locale ! mandir = $(datarootdir)/man man1dir = $(mandir)/man1 manext = .1 man1ext = .1 --- 78,84 ---- docsubdir = $(PACKAGE)-$(DOS2UNIX_VERSION) docdir = $(datarootdir)/doc/$(docsubdir) localedir = $(datarootdir)/locale ! mandir = $(prefix)/man man1dir = $(mandir)/man1 manext = .1 man1ext = .1 *************** *** 119,125 **** --- 119,134 ---- # ......................................................... OS flags ... + D2U_OS = aix + 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) *************** *** 269,276 **** # or I don't know how to do it. CFLAGS_USER = ! CFLAGS ?= -O2 ! CFLAGS += -Wall -Wextra -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER) EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ -DVER_DATE=\"$(DOS2UNIX_DATE)\" \ --- 278,285 ---- # or I don't know how to do it. CFLAGS_USER = ! CFLAGS = -O2 ! CFLAGS += $(CPPFLAGS) $(CFLAGS_USER) -D_LARGE_FILES EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ -DVER_DATE=\"$(DOS2UNIX_DATE)\" \ *************** *** 296,302 **** endif LDFLAGS_USER = ! LDFLAGS = $(RPM_OPT_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER) LIBS = $(LIBS_EXTRA) DEFS_USER = --- 305,311 ---- endif LDFLAGS_USER = ! LDFLAGS = $(LDFLAGS_EXTRA) $(LDFLAGS_USER) LIBS = $(LIBS_EXTRA) DEFS_USER = *************** *** 561,574 **** 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) --- 570,583 ---- 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)