diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:05:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:05:15 -0500 |
| commit | fd19e44f449f7e2e58d42d7bb6813e2292c38fba (patch) | |
| tree | 0c5c6af2e6a6d9a88e4a502da77940f8e20caa17 | |
| parent | ebaf0c6032f525ddb0158fb59848d41899dce8cd (diff) | |
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 | |||
| 789 | 789 | ||
| 790 | pattern = ".*/localversion[^~]*" | 790 | pattern = ".*/localversion[^~]*" |
| 791 | string = $(shell cat /dev/null \ | 791 | string = $(shell cat /dev/null \ |
| 792 | `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`) | 792 | `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort -u`) |
| 793 | 793 | ||
| 794 | localver = $(subst $(space),, $(string) \ | 794 | localver = $(subst $(space),, $(string) \ |
| 795 | $(patsubst "%",%,$(CONFIG_LOCALVERSION))) | 795 | $(patsubst "%",%,$(CONFIG_LOCALVERSION))) |
