[RFA] more sed fixes for Makefile.in

[RFA] more sed fixes for Makefile.in

[Theodore A. Roth]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 231 bytes --]

Jim B's post got me looking at Makefile.in again.

In my previous patch,

  http://sources.redhat.com/ml/gdb-patches/2003-07/msg00249.html

I think I should have also made the changes in the attached patch.

Ok to commit?

Ted Roth

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1360 bytes --]

2003-10-07  Theodore A. Roth  <troth@openavr.org>

	* Makefile.in (uninstall): Quote sed expression when generating
        transformed_name.
	(install-gdbtk): Ditto.
	(uninstall-gdbtk): Ditto.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.450
diff -u -p -r1.450 Makefile.in
--- Makefile.in	26 Sep 2003 14:36:56 -0000	1.450
+++ Makefile.in	7 Oct 2003 22:11:26 -0000
@@ -980,7 +980,7 @@ install-only: $(CONFIG_INSTALL)
 
 uninstall: force $(CONFIG_UNINSTALL)
 	transformed_name=`t='$(program_transform_name)'; \
-			  echo gdb | sed -e $$t` ; \
+			  echo gdb | sed -e "$$t"` ; \
 		if test "x$$transformed_name" = x; then \
 		  transformed_name=gdb ; \
 		else \
@@ -2517,7 +2517,7 @@ all-gdbtk: insight$(EXEEXT)
 
 install-gdbtk:
 	transformed_name=`t='$(program_transform_name)'; \
-		  echo insight | sed -e $$t` ; \
+		  echo insight | sed -e "$$t"` ; \
 	if test "x$$transformed_name" = x; then \
 	  transformed_name=insight ; \
 	else \
@@ -2547,7 +2547,7 @@ install-gdbtk:
 
 uninstall-gdbtk:
 	transformed_name=`t='$(program_transform_name)'; \
-		  echo insight | sed -e $$t` ; \
+		  echo insight | sed -e "$$t"` ; \
 	if test "x$$transformed_name" = x; then \
 		transformed_name=insight ; \
 	else \

Re: [RFA] more sed fixes for Makefile.in

[Daniel Jacobowitz]

On Tue, Oct 07, 2003 at 03:38:17PM -0700, Theodore A. Roth wrote:
> Jim B's post got me looking at Makefile.in again.
> 
> In my previous patch,
> 
>   http://sources.redhat.com/ml/gdb-patches/2003-07/msg00249.html
> 
> I think I should have also made the changes in the attached patch.
> 
> Ok to commit?

I think so.  GCC uses $$t in some places and
'$(program_transform_name)' directly in others, but from what I know
about shell quoting your change looks correct.

Go ahead if no on objects in the next day or so.

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

Re: [RFA] more sed fixes for Makefile.in

[Felix Lee]

you should make sure the configure files create a
program_transform_name that looks like "sedcmd;sedcmd" rather
than "-e sedcmd -e sedcmd".  I think this was an autoconf version
dependency.  I'm kind of skeptical program_transform_name works
right.  some time ago I was trying to pass my own
program-transform-name arg to configure, I forget why exactly,
but I ran into all sorts of problems and eventually just gave up
and did something else.
--

Re: [RFA] more sed fixes for Makefile.in

[Daniel Jacobowitz]

On Tue, Oct 07, 2003 at 04:38:07PM -0700, Felix Lee wrote:
> you should make sure the configure files create a
> program_transform_name that looks like "sedcmd;sedcmd" rather
> than "-e sedcmd -e sedcmd".  I think this was an autoconf version
> dependency.  I'm kind of skeptical program_transform_name works
> right.  some time ago I was trying to pass my own
> program-transform-name arg to configure, I forget why exactly,
> but I ran into all sorts of problems and eventually just gave up
> and did something else.

There were quoting problems in the toplevel.  I fixed them not long
ago.  There are more, caused by bugs in autoconf, so passing
program-transform-names which contain backslashes doesn't always work
right.

I think you may be right about the -e -e thing, but autoconf 2.5x and
2.13 both use ; instead.

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

Re: [RFA] more sed fixes for Makefile.in

[Felix Lee]

Daniel Jacobowitz <drow@mvista.com>:
> I think you may be right about the -e -e thing, but autoconf 2.5x and
> 2.13 both use ; instead.

yeah.

looks like the right way these days is
    sed -e $$t
no quotes around the $$t, because configure does the quoting (and
uses 's,x,x,' for null transformation).

I just looked, there are lots of old configures in the tree that
don't do that quoting, but I think they're in directories that
don't use program_transform_name, so it might not matter.

also, sim/common/configure.in has a
      t='\$(program_transform_name)'; echo gcc | sed -e 's/x/x/' \$\$t; \
that needs to be fixed
--

Re: [RFA] more sed fixes for Makefile.in

[Theodore A. Roth]

On Tue, 7 Oct 2003, Felix Lee wrote:

> Daniel Jacobowitz <drow@mvista.com>:
> > I think you may be right about the -e -e thing, but autoconf 2.5x and
> > 2.13 both use ; instead.
>
> yeah.
>
> looks like the right way these days is
>     sed -e $$t
> no quotes around the $$t, because configure does the quoting (and
> uses 's,x,x,' for null transformation).
>
> I just looked, there are lots of old configures in the tree that
> don't do that quoting, but I think they're in directories that
> don't use program_transform_name, so it might not matter.
>
> also, sim/common/configure.in has a
>       t='\$(program_transform_name)'; echo gcc | sed -e 's/x/x/' \$\$t; \
> that needs to be fixed

Ok, sounds like I'll have to withdraw my patch.

Should probably also revert my patch from 2003-07-11 at some point
when gdb isn't using autocon-2.13 anymore.

Ted Roth