Commit 02fa4195 authored by Marc G. Fournier's avatar Marc G. Fournier

Fix detection of install vs installbsd

Submitted by: adrian@waltham.harvard.net
parent df2374f0
This diff is collapsed.
...@@ -258,18 +258,25 @@ AC_SUBST(HAVECXX) ...@@ -258,18 +258,25 @@ AC_SUBST(HAVECXX)
dnl AC_PROG_INSTALL was broken on my machine (NAT), so here's an dnl AC_PROG_INSTALL was broken on my machine (NAT), so here's an
dnl alternative, built from the various portname options dnl alternative, built from the various portname options
AC_PATH_PROG(INSTALL, install, /usr/bin:/usr/ucb:/home/tools/bin) AC_PATH_PROG(INSTALL, install, , /usr/bin:/usr/ucb:/home/tools/bin)
AC_PATH_PROG(BSDINST, bsdinst, /usr/bin/X11:/usr/X11R6/bin:/sbin) AC_PATH_PROG(BSDINST, bsdinst, ,/usr/bin/X11:/usr/X11/bin:/sbin:/opt/X11/bin:/usr/X11R6/bin)
AC_PATH_PROG(INSTALLBSD, installbsd, , /bin:/usr/bin:/usr/ucb)
INSTLOPTS="-m 444" INSTLOPTS="-m 444"
INSTL_EXE_OPTS="-m 555" INSTL_EXE_OPTS="-m 555"
INSTL_LIB_OPTS="-m 664" INSTL_LIB_OPTS="-m 664"
if test -n "$INSTALL"; then if test -f "$INSTALLBSD"; then
INSTALL=$INSTALLBSD
elif test -f "$INSTALL"; then
INSTLOPTS="-c $INSTLOPTS" INSTLOPTS="-c $INSTLOPTS"
INSTL_EXE_OPTS="-c $INSTL_EXE_OPTS" INSTL_EXE_OPTS="-c $INSTL_EXE_OPTS"
INSTL_LIB_OPTS="-c $INSTL_LIB_OPTS" INSTL_LIB_OPTS="-c $INSTL_LIB_OPTS"
else elif test -f "$BSDINST"; then
INSTALL=$BSDINST INSTALL=$BSDINST
else
echo "- No Install Script found - aborting."
exit 0;
fi fi
echo "- Using $INSTALL"
AC_SUBST(INSTALL) AC_SUBST(INSTALL)
AC_SUBST(INSTLOPTS) AC_SUBST(INSTLOPTS)
AC_SUBST(INSTL_LIB_OPTS) AC_SUBST(INSTL_LIB_OPTS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment