*** ./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 <stdio.h>
  #include <stdlib.h>
+ #include <stdarg.h>
  #include <errno.h>
  #include <string.h>
  #include <ctype.h>
*** ./src/Makefile.ORIG	Mon Jan  4 16:10:55 2016
--- ./src/Makefile	Mon Jan  4 16:17:19 2016
***************
*** 44,50 ****
  
  .PRECIOUS: %.1 %.pod
  
! CC		?= gcc
  STATIC		=
  STRIP		= strip
  
--- 44,50 ----
  
  .PRECIOUS: %.1 %.pod
  
! CC		= cc -qcpluscmt
  STATIC		=
  STRIP		= strip
  
***************
*** 51,61 ****
  ENABLE_NLS = 1
  
  PACKAGE		= wcd
! EXT		= .exe
  PROGRAM         = $(PACKAGE)$(EXT)
  BIN		= $(PROGRAM)
  
! PREFIX		= /usr
  prefix		= $(PREFIX)
  exec_prefix	= $(prefix)
  bindir		= $(exec_prefix)/bin
--- 51,61 ----
  ENABLE_NLS = 1
  
  PACKAGE		= wcd
! EXT		=
  PROGRAM         = $(PACKAGE)$(EXT)
  BIN		= $(PROGRAM)
  
! PREFIX		= /opt/freeware
  prefix		= $(PREFIX)
  exec_prefix	= $(prefix)
  bindir		= $(exec_prefix)/bin
***************
*** 68,74 ****
  sysconfdir      = /etc
  
  # 1 = regular, 5 = conf, 6 = games, 8 = daemons
! mandir		= $(datarootdir)/man
  man1dir		= $(mandir)/man1
  
  
--- 68,74 ----
  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
***************
*** 167,173 ****
  
  # ......................................................... OS flags ...
  
! OS =
  
  ifndef OS
  ifeq ($(findstring CYGWIN,$(wcd_os)),CYGWIN)
--- 167,173 ----
  
  # ......................................................... OS flags ...
  
! OS = aix
  
  ifndef OS
  ifeq ($(findstring CYGWIN,$(wcd_os)),CYGWIN)
***************
*** 204,209 ****
--- 204,213 ----
  endif
  
  
+ ifeq (aix,$(OS))
+ 	LDFLAGS_EXTRA = -L/opt/freeware/lib -lintl
+ endif
+ 
  ifeq (cygwin,$(OS))
  ifdef ENABLE_NLS
  	LIBS_EXTRA    = -lintl -liconv -lmpr
***************
*** 288,298 ****
  # .......................................................... 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
--- 292,302 ----
  # .......................................................... unicode ...
  
  ifdef UCS
! 	CFLAGS_UCS =
  	WDEFS	   = -DWCD_UNICODE
  endif
  ifdef UNINORM
! 	CFLAGS_UCS =
  	WDEFS	   = -DWCD_UNICODE -DWCD_UNINORM
  	LIB_UNISTRING  = -lunistring
  endif
***************
*** 309,315 ****
  ifdef UCS
  	CURSES = ncursesw
  else
! 	CURSES = ncurses
  endif
  
  ifdef CURSES
--- 313,319 ----
  ifdef UCS
  	CURSES = ncursesw
  else
! 	CURSES = curses
  endif
  
  ifdef CURSES
***************
*** 376,383 ****
  # (often found as /usr/lib/libncurses.a) to the OBJS1 list.
  
  CFLAGS_USER	=
! CFLAGS	?= -O2
! CFLAGS  += -Wall -Wextra -Wno-unused-parameter -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER)
  
  EXTRA_CFLAGS	= -Ic3po \
  		  $(CFLAGS_VERSION) \
--- 380,387 ----
  # (often found as /usr/lib/libncurses.a) to the OBJS1 list.
  
  CFLAGS_USER	=
! CFLAGS	= -O
! CFLAGS  += $(CPPFLAGS) $(CFLAGS_USER)
  
  EXTRA_CFLAGS	= -Ic3po \
  		  $(CFLAGS_VERSION) \
***************
*** 407,414 ****
  endif
  
  LDFLAGS_USER   =
! LDFLAGS		= $(RPM_OPT_FLAGS) \
! 	          $(LDFLAGS_EXTRA) \
  		  $(NLFLAG) \
  		  $(LDFLAG_STATIC) \
  		  $(LDFLAGS_USER)
--- 411,417 ----
  endif
  
  LDFLAGS_USER   =
! LDFLAGS		= $(LDFLAGS_EXTRA) \
  		  $(NLFLAG) \
  		  $(LDFLAG_STATIC) \
  		  $(LDFLAGS_USER)
***************
*** 514,520 ****
  	pod2text $< > $@
  
  %.ps : %.1
! 	groff -man $< -T ps > $@
  
  %.$(HTMLEXT) : %.pod
  	PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(VERSION) - Wherever Change Directory" $< > $@
--- 517,523 ----
  	pod2text $< > $@
  
  %.ps : %.1
! 	groff -mandoc $< -T ps > $@
  
  %.$(HTMLEXT) : %.pod
  	PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(VERSION) - Wherever Change Directory" $< > $@