* Makefile.in (exec_prefix, bindir, libdir, mandir, infodir, datadir,

        INSTALL_PROGRAM, INSTALL_DATA): Use autoconf-set values.
        * configure.in (AC_PREREQ): autoconf 2.5 or higher.
        (AC_PROG_INSTALL): added.
        * configure: Rebuilt.

4 files changed, 86 insertions, 10 deletions

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index aa881ec7..c7100d7 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jun 24 18:27:28 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (exec_prefix, bindir, libdir, mandir, infodir, datadir,
+	INSTALL_PROGRAM, INSTALL_DATA): Use autoconf-set values.
+	* configure.in (AC_PREREQ): autoconf 2.5 or higher.
+	(AC_PROG_INSTALL): added.
+	* configure: Rebuilt.
+
 Mon Jun 24 12:03:09 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.in: On alpha*-*-osf*, link against libbfd.a if not
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 1f5e0f0..1aa7eed 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -6,23 +6,23 @@ VPATH = @srcdir@
 srcdir = @srcdir@
 prefix = @prefix@
 
-exec_prefix 	= $(prefix)
+exec_prefix 	= @exec_prefix@
 program_transform_name = @program_transform_name@
 
-bindir 	= $(exec_prefix)/bin
-libdir 	= $(exec_prefix)/lib
+bindir 	= @bindir@
+libdir 	= @libdir@
 tooldir = $(libdir)
-mandir 	= $(prefix)/man
+mandir 	= @mandir@
 man1dir = $(mandir)/man1
 
-infodir	= $(prefix)/info
-datadir = $(prefix)/lib
+infodir	= @infodir@
+datadir = @datadir@
 
 SHELL = /bin/sh
 
 INSTALL = `cd $(srcdir); pwd`/../install.sh -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1
 MAKEINFO	= makeinfo
diff --git a/gprof/configure b/gprof/configure
index 144832b..3cbf609 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -649,7 +649,6 @@ else
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
-
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -669,6 +668,66 @@ ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      for ac_prog in ginstall installbsd scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    # OSF/1 installbsd also uses dspmsg, but is usable.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_ifs"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
 
 # Do some error checking and defaulting for the host and target type.
 # The inputs are:
@@ -954,6 +1013,7 @@ do
 done
 
 ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -986,6 +1046,8 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@CC@%$CC%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
@@ -1044,6 +1106,10 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
     top_srcdir="$ac_dots$ac_given_srcdir" ;;
   esac
 
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -1056,6 +1122,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
 " -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
 fi; done
 rm -f conftest.subs
diff --git a/gprof/configure.in b/gprof/configure.in
index d10dcd9..0d01bc6 100644
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.3)dnl
+AC_PREREQ(2.5)dnl
 AC_INIT(gprof.c)
 
 AC_ARG_ENABLE(shared,
@@ -12,6 +12,7 @@ AC_ARG_ENABLE(shared,
 esac])dnl
 
 AC_PROG_CC
+AC_PROG_INSTALL
 
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM