Commit 78aa0b38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 343cd4fb f66ba560

scripts/package/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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