From e42dc6049611fc5a9c3b44eba7a7fecf87393a9f Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 7 May 1999 11:22:05 +0000 Subject: [PATCH] DESTDIR is already trimmed to the correct directory From-SVN: r26823 --- gcc/ChangeLog | 9 +++++++++ gcc/fixinc/hackshell.tpl | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 27aa6555669..e1c6523a0d3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -11,11 +11,20 @@ Fri May 7 09:54:11 1999 Nick Clifton (TARGET_SWITCHES): Add `no-poke-function-name'. Fri May 7 14:19:31 1999 Rainer Orth + + * 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 diff --git a/gcc/fixinc/hackshell.tpl b/gcc/fixinc/hackshell.tpl index 9e9af4da140..7ac6ddb861c 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} | -- 2.30.2