[Monotone-commits-diffs] net.venge.monotone: 77b979e7e076d616db31aefe2c3fa53fc072c06d

[code]

revision:            77b979e7e076d616db31aefe2c3fa53fc072c06d
date:                2011-03-14T22:06:32
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
'make distclean' called by 'make distcheck' complains that there are .gmo
files lying around in the build directory.  Clearly, that's not as it
should be.

* Makefile.am (MAINTAINERCLEAN_POFILES): Renamed to DISTCLEAN_GMOFILES.
  (DISTCLEANFILES): Include $(DISTCLEAN_GMOFILES)
  (MAINTAINERCLEANFILES): Remove $(MAINTAINERCLEAN_POFILES)


manifest:
format_version "1"

new_manifest [b0c3bf1ee5f16513c32a31773fa7ca4af51b5f8b]

old_revision [c5e9a7c70187659656ef2ef9051a8b7cfb249d84]

patch "Makefile.am"
 from [d69712f183fcf32ea6b3f03f01e7fd4fdfbe2c84]
   to [9ba41fe201f411a1e2839a2df5e464f460718e51]
============================================================
--- Makefile.am	d69712f183fcf32ea6b3f03f01e7fd4fdfbe2c84
+++ Makefile.am	9ba41fe201f411a1e2839a2df5e464f460718e51
@@ -410,7 +410,7 @@ CLEAN_POFILES := $(addprefix po/,$(addsu
 ALL_GMOFILES  := $(addprefix po/,$(addsuffix .gmo, $(ALL_LINGUAS)))
 CLEAN_POFILES := $(addprefix po/,$(addsuffix .merged.po, $(ALL_LINGUAS))) \
 		 po/$(PACKAGE).pot
-MAINTAINERCLEAN_POFILES := $(ALL_GMOFILES)
+DISTCLEAN_GMOFILES:= $(ALL_GMOFILES)
 
 EXTRA_DIST += $(ALL_POFILES) $(ALL_POREADMES) po/LINGUAS po/README
 
@@ -711,15 +711,13 @@ CLEANFILES = $(bin_SCRIPTS) $(noinst_SCR
 CLEANFILES = $(bin_SCRIPTS) $(noinst_SCRIPTS) $(bashcomp_DATA) \
 	$(CLEAN_SRCS) $(CLEAN_POFILES)
 
-DISTCLEANFILES = src/xgettext.opts src/pch-build.hh.gch.dep
+DISTCLEANFILES = src/xgettext.opts src/pch-build.hh.gch.dep		\
+	$(DISTCLEAN_GMOFILES)
 
-# We make GMO files part of the source distribution.  This means we can't
-# clean them away like other files, but a maintainer might still want to
-# get rid of them to rebuild them.
-# The same goes for src/package_revision.txt and
-# src/package_full_revision_dist.txt
+# a maintainer might still want to get rid of src/package_revision.txt and
+# src/package_full_revision_dist.txt to rebuild them.
 
-MAINTAINERCLEANFILES = $(MAINTAINERCLEAN_POFILES) \
+MAINTAINERCLEANFILES = \
 	src/package_revision.txt src/package_full_revision_dist.txt
 
 # automake provides no nice way to build a helper program to execute