Re: svn commit: r10130 - in trunk: . subversion/libsvn_subr

* lundblad@tigris.org <lundblad@tigris.org> [2004-07-03 14:28]:
> --- trunk/Makefile.in (original)
> +++ trunk/Makefile.in Sat Jul 3 10:24:57 2004
> @@ -522,11 +522,22 @@
> .dvi.pdf:
> $(DVIPDF) $< $@
>
> -.po.spo:
> - sed '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' $< > $@
> +# Strip the Content-Type: header from the po file if we don't have a
> +# gettext that supports bind_textdomain_codeset, so it doesn't try
> +# to convert our UTF-8 .po files to the locale encoding.
> +@NO_GETTEXT_CODESET@.po.spo:
> +@NO_GETTEXT_CODESET@ sed \
> +@NO_GETTEXT_CODESET@ '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' \
> +@NO_GETTEXT_CODESET@ $< > $@
> +
> +@NO_GETTEXT_CODESET@.spo.mo:
> +@NO_GETTEXT_CODESET@ $(MSGFMT) -o $@ $<
> +
> +# For systems with bind_textdomain_codeset, just leave the Content-Type:
> +# header alone.
> +@GETTEXT_CODESET@.po.mo:
> +@GETTEXT_CODESET@ $(MSGFMT) -o $@ $<

This change seems to break the configure/make process for me... 'configure'
creates a Makefile with the @NO_GETTEXT@ things on each line, just as in
Makefile.in. Then make complains with:

Makefile:529: target `@NO_GETTEXT_CODESET@' given more than once in the same rule.
Makefile:534: *** missing separator. Stop.

Deleting the @NO_GETTEXT@ things on all but the target line fixes the problem.
I don't know enough about how Makefile.in gets transformed into Makefile to
know whether this is my problem or not. Here's a patch that gets things
working for me:

Index: Makefile.in
===================================================================
--- Makefile.in (revision 10157)
+++ Makefile.in (working copy)
@@ -526,17 +526,17 @@
 # gettext that supports bind_textdomain_codeset, so it doesn't try
 # to convert our UTF-8 .po files to the locale encoding.
 @NO_GETTEXT_CODESET@.po.spo:
-@NO_GETTEXT_CODESET@ sed \
-@NO_GETTEXT_CODESET@ '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' \
-@NO_GETTEXT_CODESET@ $< > $@
+ sed \
+ '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' \
+ $< > $@
 
 @NO_GETTEXT_CODESET@.spo.mo:
-@NO_GETTEXT_CODESET@ $(MSGFMT) -o $@ $<
+ $(MSGFMT) -o $@ $<
 
 # For systems with bind_textdomain_codeset, just leave the Content-Type:
 # header alone.
 @GETTEXT_CODESET@.po.mo:
-@GETTEXT_CODESET@ $(MSGFMT) -o $@ $<
+ $(MSGFMT) -o $@ $<
 
 
 install-docs: install-man @INSTALL_INFO@

-- Mike

-- 
Michael W. Thelen
The palest ink is better than the best memory.
                -- Chinese proverb