Use install-sh unconditionally.

configure.in

@@ -602,30 +602,6 @@ echo "using CPPFLAGS=$CPPFLAGS"
 echo "using LDFLAGS=$LDFLAGS"
 
 
-# Figure out how to invoke "install" and what install options to use.
-
-AC_PROG_INSTALL
-# When Autoconf chooses install-sh as install 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 $INSTALL in
-  *install-sh*) INSTALL='\${SHELL} \${top_srcdir}/config/install-sh -c';;
-esac
-
-# Fix Autoconf's brain-dead defaults for script installs.
-INSTALL_SCRIPT="\${INSTALL} -m 755"
-
-# HPUX wants shared libs to be mode 555. Add your platform's special
-# needs here if necessary.
-case $host_os in
-    hpux*)      INSTL_SHLIB_OPTS="-m 555" ;;
-    *)          INSTL_SHLIB_OPTS="-m 755" ;;
-esac
-
-INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS"
-AC_SUBST(INSTALL_SHLIB)
-
-
 AC_PROG_AWK
 PGAC_PATH_FLEX
 AC_PROG_LN_S

src/Makefile.global.in

@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.122 2001/03/05 09:39:51 peter Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.123 2001/03/10 10:38:59 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -185,12 +185,14 @@ WISH	= @WISH@
 
 # Installation.
 
-INSTALL	= @INSTALL@
+INSTALL	= $(SHELL) $(top_srcdir)/config/install-sh -c
 
-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+INSTALL_PROGRAM	= $(INSTALL)
-INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+INSTALL_SCRIPT	= $(INSTALL) -m 755
-INSTALL_DATA	= @INSTALL_DATA@
+INSTALL_DATA	= $(INSTALL) -m 644
-INSTALL_SHLIB	= @INSTALL_SHLIB@
+INSTALL_SHLIB	= $(INSTALL) $(INSTALL_SHLIB_OPTS)
+# Override in Makefile.port if necessary
+INSTALL_SHLIB_OPTS = -m 755
 
 mkinstalldirs	= $(SHELL) $(top_srcdir)/config/mkinstalldirs
 missing		= $(SHELL) $(top_srcdir)/config/missing

src/makefiles/Makefile.hpux

@@ -30,6 +30,8 @@ LDFLAGS += -Wl,-z
 
 export_dynamic = -Wl,-E
 
+INSTALL_SHLIB_OPTS = -m 555
+
 AROPT = crs
 
 DLSUFFIX = .sl