From e46b07ca1bef6c63d742e67f731a6244d75eda6d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 15 Feb 2017 14:24:14 +0000 Subject: [PATCH] docs/C_SOURCE_FILES, po/POTFILES: Remove duplicate files. Because v2v/test-harness is a subdirectory of v2v, and because both paths are listed in $(DIST_SUBDIRS), using find $(DIST_SUBDIRS) will list files in v2v/test-harness twice. (This probably happens in other directories too, but I noticed it here.) The easiest fix for this is simply to use 'sort -u' to remove the duplicates. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7054dbd35..ac472d778 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,7 +328,7 @@ docs/C_SOURCE_FILES: configure.ac grep -v -E '/(guestfs|rc)_protocol\.' | \ grep -v -E '.*/errnostring\.' | \ grep -v -E '.*-gperf\.' | \ - LC_ALL=C sort > $@-t + LC_ALL=C sort -u > $@-t mv $@-t $@ # For more information about translations, see po/Makefile.am. @@ -340,7 +340,7 @@ po/POTFILES: configure.ac grep -v -E '/((guestfs|rc)_protocol\.c)$$' | \ grep -v -E '^python/utils\.c$$' | \ grep -v -E '^perl/lib/Sys/Guestfs\.c$$' | \ - LC_ALL=C sort > $@-t + LC_ALL=C sort -u > $@-t mv $@-t $@ po/POTFILES-ml: configure.ac