]> err.no Git - linux-2.6/commitdiff
don't use 'localversion*' files twice
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 12 Feb 2007 23:05:15 +0000 (15:05 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 12 Feb 2007 23:05:15 +0000 (15:05 -0800)
Since we look in both source and object directories for localversion*
files, we accidentally ended up getting them twice.  Use 'sort -u' to
avoid that.

Reported-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Makefile

index cdeda68cf2aa9082571366837a504fe80ef6c40e..7e4968fb2134d3b90206dbcd9a08a773c934399c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -789,7 +789,7 @@ $(vmlinux-dirs): prepare scripts
 
 pattern = ".*/localversion[^~]*"
 string  = $(shell cat /dev/null \
-          `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`)
+          `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort -u`)
 
 localver = $(subst $(space),, $(string) \
                              $(patsubst "%",%,$(CONFIG_LOCALVERSION)))