summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 15:05:15 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 15:05:15 -0800
commitfd19e44f449f7e2e58d42d7bb6813e2292c38fba (patch)
tree0c5c6af2e6a6d9a88e4a502da77940f8e20caa17 /Makefile
parentebaf0c6032f525ddb0158fb59848d41899dce8cd (diff)
downloadlwn-fd19e44f449f7e2e58d42d7bb6813e2292c38fba.tar.gz
lwn-fd19e44f449f7e2e58d42d7bb6813e2292c38fba.zip
don't use 'localversion*' files twice
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cdeda68cf2aa..7e4968fb2134 100644
--- 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)))