? intltool.am
? tests/az
? tests/extract9
? tests/fr
? tests/fr_BE
? tests/fr_FR
? tests/merge6
? tests/merge6.xml
? tests/schemasmerge1
? tests/schemasmerge2
? tests/test
? tests/cases/extract-comments.xml.h
? tests/cases/extract10.templates_.h
? tests/cases/extract12.xml.in.h
? tests/cases/extract9.xml
? tests/cases/extract9.xml.h
? tests/cases/extract9.xml.in.h
? tests/cases/merge-cdata.xml
? tests/cases/merge-deepattr.xml
? tests/cases/merge10.templates
? tests/cases/test.schemas
? tests/cases/test.schemas.in.h
? tests/cases/test.scm.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/intltool/ChangeLog,v
retrieving revision 1.453
diff -u -p -r1.453 ChangeLog
--- ChangeLog	21 Jan 2005 02:04:38 -0000	1.453
+++ ChangeLog	21 Jan 2005 02:39:15 -0000
@@ -1,3 +1,16 @@
+2005-01-20  Rodney Dawes  <dobey@novell.com>
+
+	* Makefile.in.in (MSGMERGE, GENPOT): Set srcdir for these two scripts
+	(DISTFILES): Remove $(GETTEXT_PACKAGE).pot from here
+	(mostlyclean): Fix a bug and remove $(GETTEXT_PACKAGE).pot instead of
+	$(GETTEXT_PACKAGE).po, since this is actually the file
+
+	* intltool-update.in.in (GeneratePOTemplate): Use ../$_.h\n for the
+	OUTFILE when generating the headers for xml/ini support
+	Use . as the directory argument for xgettext instead of ..
+
+	Fixes #159846
+
 2005-01-20  Miloslav Trmac <mitr@volny.cz>
 
 	* intltool-extract.in.in (type_xml): Ignore empty strings that are
Index: Makefile.in.in
===================================================================
RCS file: /cvs/gnome/intltool/Makefile.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.in.in
--- Makefile.in.in	4 Nov 2004 05:23:48 -0000	1.2
+++ Makefile.in.in	21 Jan 2005 02:39:15 -0000
@@ -46,8 +46,8 @@ MSGFMT = @MSGFMT@
 XGETTEXT = @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
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -60,7 +60,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $
 SOURCES = 
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
 $(POFILES) $(GMOFILES) $(SOURCES)
 
 POTFILES = \
@@ -179,7 +179,7 @@ check: all
 dvi info tags TAGS ID:
 
 mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
+	rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
 	rm -fr *.o
 	rm -f .intltool-merge-cache
 
Index: intltool-update.in.in
===================================================================
RCS file: /cvs/gnome/intltool/intltool-update.in.in,v
retrieving revision 1.115
diff -u -p -r1.115 intltool-update.in.in
--- intltool-update.in.in	21 Jan 2005 01:34:22 -0000	1.115
+++ intltool-update.in.in	21 Jan 2005 02:39:16 -0000
@@ -661,7 +661,7 @@ sub GeneratePOTemplate
 	elsif (/\.($xml_support|$ini_support)$/ || /^\[/)
 	{
 	    s/^\[.*]\s*//;
-	    print OUTFILE "$_.h\n";
+	    print OUTFILE "../$_.h\n";
 	    push @temp_headers, "../$_.h";
 	    $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code);
 	} 
@@ -713,7 +713,7 @@ sub GeneratePOTemplate
     unlink "$MODULE.pot";
     my @xgettext_argument=("$XGETTEXT",
 			   "--add-comments",
-			   "--directory\=\.\.",
+			   "--directory\=\.",
 			   "--output\=$MODULE\.pot",
 			   "--files-from\=\.\/POTFILES\.in\.temp");
     my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
