*** pgsql/configure.in	2009/08/19 08:28:50	1.608.2.1
--- pgsql/configure.in	2009/08/26 22:24:42	1.609
*************** dnl Read the Autoconf manual for details
*** 17,23 ****
  dnl
  m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
! AC_INIT([PostgreSQL], [8.5alpha1], [pgsql-bugs@postgresql.org])
  
  m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
  Untested combinations of 'autoconf' and PostgreSQL versions are not
--- 17,23 ----
  dnl
  m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
! AC_INIT([PostgreSQL], [8.5devel], [pgsql-bugs@postgresql.org])
  
  m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
  Untested combinations of 'autoconf' and PostgreSQL versions are not
*************** fi
*** 821,826 ****
--- 821,833 ----
  AC_PATH_PROG(TAR, tar)
  AC_PROG_LN_S
  AC_PROG_AWK
+ AC_PROG_MKDIR_P
+ # When Autoconf chooses install-sh as mkdir -p program it tries to generate
+ # a relative path to it in each makefile where it subsitutes it. This clashes
+ # with our Makefile.global concept. This workaround helps.
+ case $MKDIR_P in
+   *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
+ esac
  
  PGAC_PATH_BISON
  PGAC_PATH_FLEX