Fix for install path

5ab8a4ee · Bruce Momjian · 566cd878 · 5ab8a4ee · 5ab8a4ee
隐藏空白更改
内联并排

Showing with 3 addition and 16 deletion

src/configure src/configure +1 -0

src/configure.in src/configure.in +2 -16

未找到文件。
--- a/src/configure
+++ b/src/configure
@@ -1351,6 +1351,7 @@ fi
 fi


+set -x

 for ac_prog in ginstall
 do

--- a/src/configure.in
+++ b/src/configure.in
@@ -354,22 +354,8 @@ AC_ARG_WITH(CXX,
    [   AC_PROG_CXX])
 AC_SUBST(HAVECXX)

-AC_PATH_PROGS(INSTALL, ginstall, NONE, "/usr/ucb:$PATH:`pwd`")
-if test "$INSTALL" = "NONE"
-then	AC_PATH_PROGS(INSTALL, installbsd, NONE, "/usr/ucb:$PATH:`pwd`")
-fi
-if test "$INSTALL" = "NONE"
-then	AC_PATH_PROGS(INSTALL, bsdinst, NONE, "/usr/ucb:$PATH:`pwd`")
-fi
-if test "$INSTALL" = "NONE"
-then	AC_PATH_PROGS(INSTALL, scoinst, NONE, "/usr/ucb:$PATH:`pwd`")
-fi
-if test "$INSTALL" = "NONE"
-then	AC_PATH_PROGS(INSTALL, install, NONE, "/usr/ucb:$PATH:`pwd`")
-fi
-if test "$INSTALL" = "NONE"
-then	AC_PATH_PROGS(INSTALL, install-sh, NONE, "/usr/ucb:$PATH:`pwd`")
-fi
+INSTALLPATH="`echo /usr/ucb:$PATH:\`pwd\` | sed 's/:/ /g'`"
+AC_PATH_PROGS(INSTALL, ginstall installbsd bsdinst scoinst install install-sh, NONE, $INSTALLPATH )
 if test "$INSTALL" = "NONE"
 then
 	echo "- No Install Script found - aborting."