After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 102261 - patch to Makefile.in.in fails, hunk #2
patch to Makefile.in.in fails, hunk #2
Status: RESOLVED DUPLICATE of bug 101897
Product: intltool
Classification: Deprecated
Component: general
unspecified
Other Linux
: Normal normal
: ---
Assigned To: intltool maintainers
intltool maintainers
Depends on:
Blocks:
 
 
Reported: 2002-12-31 07:34 UTC by Chema Celorio
Modified: 2004-12-22 21:47 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
support for glib >= 2.1.5 (4.40 KB, patch)
2003-01-03 14:09 UTC, Frederic Crozat 		none Details | Review

Description Chema Celorio 2002-12-31 07:34:31 UTC 
With glib-gettext head, autoconf (GNU Autoconf) 2.57, automake (GNU
automake) 1.7.2, gettext (GNU gettext) 0.11.5.

intltool-po-Makefile.in.in-patch-4 fails. The Makefile.in.in.rej is:

[chema@lamark po]$ cat Makefile.in.in.rej
***************
*** 45,51 ****
  GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
  MSGFMT = @MSGFMT@
  XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
- MSGMERGE = PATH=../src:$$PATH msgmerge

  DEFS = @DEFS@
  CFLAGS = @CFLAGS@
--- 46,55 ----
  GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
  MSGFMT = @MSGFMT@
  XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE)
--gettext-package $(GETTEXT_PACKAGE) --dist
+ GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE)
--gettext-package $(GETTEXT_PACKAGE) --pot

  DEFS = @DEFS@
  CFLAGS = @CFLAGS@
[chema@lamark po]$
Comment 1 Frederic Crozat 2003-01-03 14:08:22 UTC 
The attached patch fixes the problem (caused by glib po/Makefile.in.in
>= 2.1.5)
Comment 2 Frederic Crozat 2003-01-03 14:09:46 UTC 
Created attachment 13336 [details] [review]
support for glib >= 2.1.5
Comment 3 Kenneth Rohde Christiansen 2003-01-05 16:50:10 UTC 

*** This bug has been marked as a duplicate of 101897 ***
Comment 4 Kenneth Rohde Christiansen 2003-01-05 20:02:50 UTC 
Frederic, you patch looks good. Please commit.
Comment 5 Frederic Crozat 2003-01-06 09:00:47 UTC 
Committed..