aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Orth <ro@TechFak.Uni-Bielefeld.DE>1999-05-07 11:22:05 +0000
committerBruce Korb <korbb@gcc.gnu.org>1999-05-07 11:22:05 +0000
commite42dc6049611fc5a9c3b44eba7a7fecf87393a9f (patch)
tree8d61feaaf768c46a1a42c5b333fbef8e840391c5
parent7d032a4f633e9fc456d66a7817f3cd12fda52d68 (diff)
downloadgcc-e42dc6049611fc5a9c3b44eba7a7fecf87393a9f.zip
gcc-e42dc6049611fc5a9c3b44eba7a7fecf87393a9f.tar.gz
gcc-e42dc6049611fc5a9c3b44eba7a7fecf87393a9f.tar.bz2
DESTDIR is already trimmed to the correct directory
From-SVN: r26823
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/fixinc/hackshell.tpl2
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27aa655..e1c6523 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -11,11 +11,20 @@ Fri May 7 09:54:11 1999 Nick Clifton <nickc@cygnus.com>
(TARGET_SWITCHES): Add `no-poke-function-name'.
Fri May 7 14:19:31 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * fixinc/server.c (load_data): Cast text_size to long, adapt
+ format.
* fixinc/server.c (read_pipe_timeout): Declare volatile, modified
in signal handler.
(sig_handler): Add debug code.
* fixinc/server.c (run_shell): Don't \-escape cd, it breaks the
Ultrix V4.3 /bin/sh.
+ * fixinc/server.c (def_args): Use static instead of STATIC to
+ avoid redefinition error from linker iff DEBUG.
+
+ * fixinc/hackshell.tpl: Don't strip trailing directory from
+ DESTDIR - that is already done
+
* fixinc/fixincl.c (run_compiles): fix memory leak
Thu May 6 20:34:00 1999 Mark Mitchell <mark@codesourcery.com>
diff --git a/gcc/fixinc/hackshell.tpl b/gcc/fixinc/hackshell.tpl
index 9e9af4d..7ac6ddb 100644
--- a/gcc/fixinc/hackshell.tpl
+++ b/gcc/fixinc/hackshell.tpl
@@ -174,7 +174,7 @@ _FOR fix "\n\n" =]
# Find any include directives that use "file".
#
dir=`echo ${file} | sed -e s';/[^/]*$;;'`
- ddir=`echo ${DESTDIR} | sed 's;/[^/]*$;;'`/$dir
+ ddir=`ec${DESTDIR}/$dir
for include in `
egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${DESTFILE} |