diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-06-15 10:46:49 +0000 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-06-15 10:46:49 +0000 |
| commit | 3daac7e5431f827f73e7bfc55cdc0d6d9357f07c (patch) | |
| tree | 783d7df3a45e38d33e1b0f45a8360f478700ca60 /Makefile | |
| parent | c6c525a2b598edf0bf5665122c8f1bd23fe8d0d0 (diff) | |
| parent | d5eda75f3a6a08f5a3644764a88d288e62e7823d (diff) | |
Merge branch 'rc-fixes' into for-next
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO localver-extra = $(scm-identifier) else ifneq ($(scm-identifier),) - ifeq ($(LOCALVERSION),) + ifeq ("$(origin LOCALVERSION)", "undefined") localver-extra = + endif endif |