diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-20 07:58:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-20 07:58:51 -0700 |
| commit | 78aa0b3899297039259f645f107ea8b401eecf1e (patch) | |
| tree | 1ec3ab74c0d6aa05f475b76ddef90584f60ddd52 | |
| parent | 343cd4fb412c3c7d4bc2de3cd456011b2ab338e1 (diff) | |
| parent | f66ba560943ae21f5d1e505bad0a3591823b2b37 (diff) | |
| download | linux-3.10-78aa0b3899297039259f645f107ea8b401eecf1e.tar.gz linux-3.10-78aa0b3899297039259f645f107ea8b401eecf1e.tar.bz2 linux-3.10-78aa0b3899297039259f645f107ea8b401eecf1e.zip | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fix from Michal Marek:
"In an attempt to improve make rpm-pkg, I broke make binrpm-pkg"
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
package: Makefile: unbreak binrpm-pkg target
| -rw-r--r-- | scripts/package/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 84a406070f6..a4f31c900fa 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -63,7 +63,7 @@ binrpm-pkg: FORCE mv -f $(objtree)/.tmp_version $(objtree)/.version $(RPM) $(RPMOPTS) --define "_builddir $(objtree)" --target \ - $(UTS_MACHINE) -bb $< + $(UTS_MACHINE) -bb $(objtree)/binkernel.spec rm binkernel.spec # Deb target |