linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* PATCH; tidy up make rpm
@ 2003-03-21 20:04 Alan Cox
  2003-03-21 22:10 ` Christoph Hellwig
  0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2003-03-21 20:04 UTC (permalink / raw)
  To: linux-kernel, torvalds

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/Makefile linux-2.5.65-ac2/Makefile
--- linux-2.5.65/Makefile	2003-03-18 16:46:45.000000000 +0000
+++ linux-2.5.65-ac2/Makefile	2003-03-20 18:02:29.000000000 +0000
@@ -164,6 +164,8 @@
 OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
 AWK		= awk
+RPM 		:= $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
+		    	else echo rpm; fi)
 GENKSYMS	= scripts/genksyms/genksyms
 DEPMOD		= /sbin/depmod
 KALLSYMS	= scripts/kallsyms
@@ -768,9 +770,7 @@
 	rm $(KERNELPATH) ; \
 	cd $(TOPDIR) ; \
 	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \
-	RPM=`which rpmbuild`; \
-	if [ -z "$$RPM" ]; then RPM=rpm; fi; \
-	$$RPM -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
+	$(RPM) -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
 	rm $(TOPDIR)/../$(KERNELPATH).tar.gz
 
 # Brief documentation of the typical targets used

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: PATCH; tidy up make rpm
  2003-03-21 20:04 PATCH; tidy up make rpm Alan Cox
@ 2003-03-21 22:10 ` Christoph Hellwig
  0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2003-03-21 22:10 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-kernel, torvalds

On Fri, Mar 21, 2003 at 08:04:43PM +0000, Alan Cox wrote:
> +RPM 		:= $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
> +		    	else echo rpm; fi)

This make variable should be RPMBUILD, not RPM


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2003-03-21 22:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-03-21 20:04 PATCH; tidy up make rpm Alan Cox
2003-03-21 22:10 ` Christoph Hellwig

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).