* Makefile.am (ldmain.o): Pass BINDIR.

	* Makefile.in: Regenerated.
	* ldmain.c (set_scripts_dir): Use make_relative_prefix for the first
	search path.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 33cc77a5759fbf3c0b1ed6357df4e046f5d57de0..6254e8056a80eeae0ab38700f9f50720ea044895 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-04  Daniel Jacobowitz  <drow@mvista.com>
+
+       * Makefile.am (ldmain.o): Pass BINDIR.
+       * Makefile.in: Regenerated.
+       * ldmain.c (set_scripts_dir): Use make_relative_prefix for the first
+       search path.
+
 2003-01-02  Ben Elliston  <bje@redhat.com>
 
        * Makefile.am (ALL_EMULATIONS): Add eelf32iq2000.o.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index d70cc0ede977a49b365c4456e596ec4f1ecd4a55..94df72acab82bcae99de1656046e0c2598295980 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -393,7 +393,7 @@ po/POTFILES.in: @MAINT@ Makefile
          && mv tmp $(srcdir)/po/POTFILES.in
 
 ldmain.o: ldmain.c config.status
-       $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c
+       $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c
 
 ldemul-list.h: Makefile
        (echo "/* This file is automatically generated.  DO NOT EDIT! */";\

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 5aa4dc918679ef64b9d809e94a4f4030793427d8..c3459a6f95c07419f79f441edfd384d7f8592987 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1121,7 +1121,7 @@ po/POTFILES.in: @MAINT@ Makefile
          && mv tmp $(srcdir)/po/POTFILES.in
 
 ldmain.o: ldmain.c config.status
-       $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c
+       $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c
 
 ldemul-list.h: Makefile
        (echo "/* This file is automatically generated.  DO NOT EDIT! */";\

diff --git a/ld/ldmain.c b/ld/ldmain.c
index c90cb6653742425ddac26062fadc9abe46596c65..3185befcc051550d688b377ae4c369245ef3885e 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -1,6 +1,6 @@
 /* Main program of GNU linker.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002
+   2002, 2003
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -611,9 +611,12 @@ check_for_scripts_dir (dir)
    Libraries will be searched for here too, but that's ok.
    We look for the "ldscripts" directory in:
 
+   SCRIPTDIR (passed from Makefile)
+            (adjusted according to the current location of the binary)
    SCRIPTDIR (passed from Makefile)
    the dir where this program is (for using it from the build tree)
-   the dir where this program is/../lib (for installing the tool suite elsewhere) */
+   the dir where this program is/../lib
+            (for installing the tool suite elsewhere)  */
 
 static void
 set_scripts_dir ()
@@ -621,6 +624,14 @@ set_scripts_dir ()
   char *end, *dir;
   size_t dirlen;
 
+  dir = make_relative_prefix (program_name, BINDIR, SCRIPTDIR);
+  if (dir && check_for_scripts_dir (dir))
+    /* Success.  Don't free dir.  */
+    return;
+
+  if (dir)
+    free (dir);
+
   if (check_for_scripts_dir (SCRIPTDIR))
     /* We've been installed normally.  */
     return;