Happens during merges; can mess up tests badly.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
# Source files
ifeq ($(revctrl),git)
# Source files
ifeq ($(revctrl),git)
-src := $(shell cd $(srcdir) && git ls-files)
+src := $(shell cd $(srcdir) && git ls-files | uniq)
else
include $(srcdir)/sources.mk
endif
else
include $(srcdir)/sources.mk
endif
GODNEWS 0
running_test_suite 1
EOF
GODNEWS 0
running_test_suite 1
EOF
- cp `git ls-files "$srcdir"/src/lib/global | grep '\.config$'` sandbox/share/empire/builtin
+ cp `git ls-files "$srcdir"/src/lib/global | uniq | grep '\.config$'` sandbox/share/empire/builtin
- feed_files `git ls-files "$@" | grep '/[0-9][0-9]-[^/]*$'`
+ feed_files `git ls-files "$@" | uniq | grep '/[0-9][0-9]-[^/]*$'`