diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 00:05:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 00:05:15 +0100 |
| commit | fd19e44f449f7e2e58d42d7bb6813e2292c38fba (patch) | |
| tree | 0c5c6af2e6a6d9a88e4a502da77940f8e20caa17 | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| download | linux-fd19e44f449f7e2e58d42d7bb6813e2292c38fba.tar.xz linux-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>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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))) |