From 5622fa28ff78b170e951af61d4a1ced4070a8066 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 3 Sep 2007 13:20:42 +0000 Subject: [PATCH] data/tips/Makefile.am s/.intltool-merge-cachemake/.intltool-merge-cache/ 2007-09-03 Michael Natterer * data/tips/Makefile.am * desktop/Makefile.am: s/.intltool-merge-cachemake/.intltool-merge-cache/ to fix distcheck, probably a "make" was entered in the wrong window. svn path=/trunk/; revision=23450 --- ChangeLog | 7 +++++++ data/tips/Makefile.am | 2 +- desktop/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3481b935f5..3be9633022 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-03 Michael Natterer + + * data/tips/Makefile.am + * desktop/Makefile.am: + s/.intltool-merge-cachemake/.intltool-merge-cache/ to fix + distcheck, probably a "make" was entered in the wrong window. + 2007-09-02 Michael Natterer * configure.in: bump version to 2.4.0-rc2. diff --git a/data/tips/Makefile.am b/data/tips/Makefile.am index 71f21d0238..1de81aba59 100644 --- a/data/tips/Makefile.am +++ b/data/tips/Makefile.am @@ -18,7 +18,7 @@ DISTCLEANFILES = $(tipsdata_data_files) gimp-tips.xml: gimp-tips.xml.in $(wildcard $(top_srcdir)/po-tips/*.po) - $(INTLTOOL_MERGE) $(top_srcdir)/po-tips $< $(@) -x -u -c $(top_builddir)/po-tips/.intltool-merge-cachemake + $(INTLTOOL_MERGE) $(top_srcdir)/po-tips $< $(@) -x -u -c $(top_builddir)/po-tips/.intltool-merge-cache validate: gimp-tips.xml diff --git a/desktop/Makefile.am b/desktop/Makefile.am index b9054fb0d5..974b2456bf 100644 --- a/desktop/Makefile.am +++ b/desktop/Makefile.am @@ -61,7 +61,7 @@ DISTCLEANFILES = $(desktop_files) gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po) - $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cachemake + $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cache validate: gimp.desktop ( dfvalidate=`which desktop-file-validate`; \