*** ./src/wcd.c.ORIG Tue Oct 8 11:12:17 2013 --- ./src/wcd.c Tue Oct 8 11:12:39 2013 *************** *** 37,42 **** --- 37,43 ---- #include #include + #include #include #include #include *** ./src/Makefile.ORIG Mon May 27 17:19:57 2019 --- ./src/Makefile Mon May 27 17:24:00 2019 *************** *** 43,49 **** .PRECIOUS: %.1 %.pod ! CC ?= gcc STATIC = STRIP = strip --- 43,49 ---- .PRECIOUS: %.1 %.pod ! CC = cc_r -qcpluscmt STATIC = STRIP = strip *************** *** 50,60 **** ENABLE_NLS = 1 PACKAGE = wcd ! EXT = .exe PROGRAM = $(PACKAGE)$(EXT) BIN = $(PROGRAM) ! PREFIX = /usr prefix = $(PREFIX) exec_prefix = $(prefix) bindir = $(exec_prefix)/bin --- 50,60 ---- ENABLE_NLS = 1 PACKAGE = wcd ! EXT = PROGRAM = $(PACKAGE)$(EXT) BIN = $(PROGRAM) ! PREFIX = /opt/freeware prefix = $(PREFIX) exec_prefix = $(prefix) bindir = $(exec_prefix)/bin *************** *** 67,73 **** sysconfdir = /etc # 1 = regular, 5 = conf, 6 = games, 8 = daemons ! mandir = $(datarootdir)/man man1dir = $(mandir)/man1 --- 67,73 ---- sysconfdir = /etc # 1 = regular, 5 = conf, 6 = games, 8 = daemons ! mandir = $(prefix)/man man1dir = $(mandir)/man1 *************** *** 138,144 **** wcd_os := $(shell uname) # Enble Unicode ! UCS = 1 ifdef WCD_UTF8 # WCD_UTF8 was used in older versions. UCS=1 --- 138,144 ---- wcd_os := $(shell uname) # Enble Unicode ! UCS = ifdef WCD_UTF8 # WCD_UTF8 was used in older versions. UCS=1 *************** *** 168,175 **** # ......................................................... OS flags ... ! OS = ifndef OS ifeq ($(findstring CYGWIN,$(wcd_os)),CYGWIN) OS = cygwin --- 168,179 ---- # ......................................................... OS flags ... ! OS = aix + ifeq (aix,$(OS)) + LDFLAGS_EXTRA = -L/opt/freeware/lib -lintl + endif + ifndef OS ifeq ($(findstring CYGWIN,$(wcd_os)),CYGWIN) OS = cygwin *************** *** 310,320 **** # .......................................................... unicode ... ifdef UCS ! CFLAGS_UCS = -std=gnu99 WDEFS = -DWCD_UNICODE endif ifdef UNINORM ! CFLAGS_UCS = -std=gnu99 WDEFS = -DWCD_UNICODE -DWCD_UNINORM LIB_UNISTRING = -lunistring endif --- 314,324 ---- # .......................................................... unicode ... ifdef UCS ! CFLAGS_UCS = WDEFS = -DWCD_UNICODE endif ifdef UNINORM ! CFLAGS_UCS = WDEFS = -DWCD_UNICODE -DWCD_UNINORM LIB_UNISTRING = -lunistring endif *************** *** 331,337 **** ifdef UCS CURSES = ncursesw else ! CURSES = ncurses endif --- 335,341 ---- ifdef UCS CURSES = ncursesw else ! CURSES = curses endif *************** *** 423,431 **** ifeq ($(DEBUG), 1) CFLAGS ?= -O0 else ! CFLAGS ?= -O2 endif ! CFLAGS += -Wall -Wextra -Wno-unused-parameter -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER) EXTRA_CFLAGS = -Ic3po \ $(CFLAGS_VERSION) \ --- 427,435 ---- ifeq ($(DEBUG), 1) CFLAGS ?= -O0 else ! CFLAGS ?= -O3 -qstrict endif ! CFLAGS += $(CPPFLAGS) $(CFLAGS_USER) EXTRA_CFLAGS = -Ic3po \ $(CFLAGS_VERSION) \ *************** *** 455,462 **** endif LDFLAGS_USER = ! LDFLAGS = $(RPM_OPT_FLAGS) \ ! $(LDFLAGS_EXTRA) \ $(NLFLAG) \ $(LDFLAG_STATIC) \ $(LDFLAGS_USER) --- 459,465 ---- endif LDFLAGS_USER = ! LDFLAGS = $(LDFLAGS_EXTRA) \ $(NLFLAG) \ $(LDFLAG_STATIC) \ $(LDFLAGS_USER) *************** *** 566,572 **** pod2text $< > $@ %.ps : %.1 ! groff -man $< -T ps > $@ %.$(HTMLEXT) : %.pod PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(VERSION) - Wherever Change Directory" $< > $@ --- 569,575 ---- pod2text $< > $@ %.ps : %.1 ! groff -mandoc $< -T ps > $@ %.$(HTMLEXT) : %.pod PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(VERSION) - Wherever Change Directory" $< > $@