canonicalize install.sh location

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5e3eaaf..9e6da7f 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 17 16:53:56 1993  david d `zoo' zuhn (zoo@cygnus.com)
+       
+       * Makefile.in: canonicalize install.sh; for use within
+       this directory (and subdirs)
+
 Mon Jun 14 12:13:22 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
 
        * Makefile.in (install, install-info): remove parentdir support,

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index c59298f..f9e8c5c 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -44,7 +44,7 @@ docdir = $(datadir)/doc
 
 SHELL = /bin/sh
 
-INSTALL = install -c
+INSTALL = `cd $(srcdir)/..'pwd`/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 INSTALL_XFORM = $(INSTALL) -t=$(program_tranform_name)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bea4db0..b5a6bfe 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+Thu Jun 17 16:53:56 1993  david d `zoo' zuhn (zoo@cygnus.com)
+       
+       * Makefile.in: canonicalize install.sh; for use within
+       this directory (and subdirs)
+
+Tue Jun 15 17:01:23 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+       * Makefile.in: remove parentdir support; use INSTALL_XFORM
+
+=======
+=======
 Thu Jun 17 15:08:35 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
 
        * configure.in (alpha-*-osf*), config/alpha/alpha-osf.mh: New
@@ -9,6 +22,7 @@ Thu Jun 17 15:08:35 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
        * config/sh/tm-sh.h (REGISTER_NAMES): Know about the news ones the
        simulator defines.
 
+>>>>>>> 1.1384
 Wed Jun 16 16:08:18 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
        * NEWS: tracking user visible changes starting with
@@ -27,6 +41,7 @@ Wed Jun 16 12:21:49 1993  Fred Fish  (fnf@cygnus.com)
        * alldeps.mak, depend:  Update to latest automatically built
        versions.
 
+>>>>>>> 1.1383
 Tue Jun 15 12:26:05 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
        * remote-vx.c: include gdbcmd.h for setlist.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index c624cf1..a423a1b 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -41,7 +41,7 @@ docdir = $(datadir)/doc
 
 SHELL = /bin/sh
 
-INSTALL = $(srcdir)/../install.sh -c
+INSTALL = `cd $(srcdir)/..;pwd`/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 INSTALL_XFORM = $(INSTALL) -t=$(program_transform_name)