From bf726173e725ccbccef404f631385d52adcabb29 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 2 Apr 1999 10:17:53 +0000
Subject: [PATCH] Update.

1999-04-02  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* elf/Makefile (CFLAGS-multiload.c): Change to allow building in
	the source directory.  Fixes PR libc/1059.

	* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Terminate the string.
---
 ChangeLog    | 8 ++++++--
 elf/Makefile | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 643dd5a0c7..de61cae094 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+1999-04-02  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* elf/Makefile (CFLAGS-multiload.c): Change to allow building in
+	the source directory.  Fixes PR libc/1059.
+
 1999-04-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
-	* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Terminate the
-	string.
+	* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Terminate the string.
 	* sysdeps/unix/sysv/linux/ttyname_r.c (__ttyname_r): Likewise.
 
 1999-04-01  Ulrich Drepper  <drepper@cygnus.com>
diff --git a/elf/Makefile b/elf/Makefile
index c6f9ef8f51..0fcb1b2e55 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -252,7 +252,7 @@ $(objpfx)loadfail.out: $(objpfx)failobj.so
 
 $(objpfx)multiload: $(libdl)
 LDFLAGS-multiload = -rdynamic
-CFLAGS-multiload.c = -DOBJDIR=\"$(objdir)/$(subdir)\"
+CFLAGS-multiload.c = -DOBJDIR=\"$(elf-objpfx)\"
 
 $(objpfx)multiload.out: $(objpfx)testobj1.so