r3217 - branches/kernel-image-2.6.11

[Jurij Smakov]

Author: jurij-guest
Date: 2005-05-23 05:39:20 +0000 (Mon, 23 May 2005)
New Revision: 3217

Modified:
   branches/kernel-image-2.6.11/Makefile
Log:
Minor fixups.


Modified: branches/kernel-image-2.6.11/Makefile
===================================================================
--- branches/kernel-image-2.6.11/Makefile	2005-05-23 00:14:35 UTC (rev 3216)
+++ branches/kernel-image-2.6.11/Makefile	2005-05-23 05:39:20 UTC (rev 3217)
@@ -68,8 +68,8 @@
 ifdef build_makeflags
   kpkg_build_cmd := MAKEFLAGS=$(build_makeflags) $(kpkg_build_cmd)
 endif
-kpkg_image_cmd  := $(if $(image_prefix),$(image_prefix))
-kpkg_image_cmd  += $(kpkg_build_cmd) --initrd kernel_image
+kpkg_image_cmd  := $(image_prefix) $(kpkg_build_cmd) --initrd kernel_image
+kpkg_image_cmd  := $(strip $(kpkg_image_cmd))
 kpkg_build_cmd  += build
 kpkg_headers_cmd += kernel-headers
 ifndef headers_dirs
@@ -104,7 +104,7 @@
 
 install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-%
 	cp -al $< install-$*;
-	cd install-$*; $(kpkg_image_cmd)
+	cd install-$*; $(subst @flavour@,$*,$(kpkg_image_cmd))
 	cat install-$*/debian/files >> debian/files;
 	rm -rf install-$*;
 	touch install-stamp-$(subarch)-$*