diff -Ncr ../base/src/Makefile.global.in ./src/Makefile.global.in
*** ../base/src/Makefile.global.in	Fri May 21 07:07:55 2004
--- ./src/Makefile.global.in	Sat May 22 17:57:29 2004
***************
*** 105,115 ****
--- 105,117 ----
  sqlmansect_dummy = l
  
  docdir := @docdir@
+ ifneq (,$(docdir))
  ifeq "$(findstring pgsql, $(docdir))" ""
  ifeq "$(findstring postgres, $(docdir))" ""
  override docdir := $(docdir)/postgresql
  endif
  endif
+ endif
  
  localedir := @localedir@
  
diff -Ncr ../base/src/bin/psql/Makefile ./src/bin/psql/Makefile
*** ../base/src/bin/psql/Makefile	Wed May 19 19:15:21 2004
--- ./src/bin/psql/Makefile	Sat May 22 17:29:16 2004
***************
*** 15,21 ****
  
  REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
  
! override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
  
  OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
  	startup.o prompt.o variables.o large_obj.o print.o describe.o \
--- 15,21 ----
  
  REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
  
! override CPPFLAGS := -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
  
  OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
  	startup.o prompt.o variables.o large_obj.o print.o describe.o \
diff -Ncr ../base/src/timezone/Makefile ./src/timezone/Makefile
*** ../base/src/timezone/Makefile	Fri May 21 07:08:06 2004
--- ./src/timezone/Makefile	Sat May 22 19:21:47 2004
***************
*** 21,27 ****
  # timezone data files
  TZDATA := africa antarctica asia australasia europe northamerica southamerica \
  	pacificnew etcetera factory backward systemv solar87 solar88 solar89
! TZDATAFILES := $(TZDATA:%=data/%)
  
  all: SUBSYS.o submake-libpgport zic
  
--- 21,27 ----
  # timezone data files
  TZDATA := africa antarctica asia australasia europe northamerica southamerica \
  	pacificnew etcetera factory backward systemv solar87 solar88 solar89
! TZDATAFILES := $(TZDATA:%=$(srcdir)/data/%)
  
  all: SUBSYS.o submake-libpgport zic