Otherwise, if the user changes locales between running the "dist-hook-git" and "distfiles" targets (e.g. in different invocations of "make"), then the "dist-hook-git" target might falsely report that the distribution is missing files.
Reported-by: John Darrington <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> --- AUTHORS | 1 + Makefile.am | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 7539b1a..4c6c365 100644 --- a/AUTHORS +++ b/AUTHORS @@ -183,6 +183,7 @@ Jeff Merrick [email protected] Jeongkeun Lee [email protected] Jian Qiu [email protected] Joan Cirer [email protected] +John Darrington [email protected] John Galgay [email protected] John Hurley [email protected] Kevin Mancuso [email protected] diff --git a/Makefile.am b/Makefile.am index 0faed67..bafd810 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,10 +158,10 @@ dist-hook-git: distfiles @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \ (cd datapath && $(MAKE) distfiles); \ (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \ - sort -u > all-distfiles; \ + LC_ALL=C sort -u > all-distfiles; \ (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \ - sort -u > all-gitfiles; \ - comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ + LC_ALL=C sort -u > all-gitfiles; \ + LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ if test -s missing-distfiles; then \ echo "The distribution is missing the following files:"; \ cat missing-distfiles; \ @@ -176,7 +176,8 @@ distfiles: Makefile list='$(DISTFILES)'; \ for file in $$list; do echo $$file; done | \ sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | \ + LC_ALL=C sort -u > $@ CLEANFILES += distfiles endif .PHONY: dist-hook-git -- 1.7.10.4 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
