From 07dc2ddb40089c216ab4ff323de177ecab8f02ef Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Tue, 25 Feb 2003 09:37:46 +0000
Subject: This commit was manufactured by cvs2svn to create branch
 'R9_0-64bit-branch'.

---
 Makefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7d252daa1..1381219d5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,15 @@ endif
 ifeq (ia64,$(ARCH))
     BOOT_IMG = all.img
 endif
+ifeq (x86_64,$(ARCH))
+    BOOT_IMG = cdrom.img network.img usb.img blank.img
+endif
 
 FBOOT_IMG = $(BOOT_IMG:%=images/%)
-FBOOT_RDZ = $(FBOOT_IMG:%.img=%.rdz) images/all.rdz
+FBOOT_RDZ = $(FBOOT_IMG:%.img=%.rdz)
+ifneq (all.img,$(findstring all.img,$(BOOT_IMG)))
+FBOOT_RDZ += images/all.rdz
+endif
 
 .PHONY: dirs install
 
@@ -65,6 +71,11 @@ install_only:
 	cp -f images/cdrom-changedisk.img $(ROOTDEST)/images
     endif
 
+    ifeq (x86_64,$(ARCH))
+	rm -rf $(ROOTDEST)/isolinux
+	cp -af isolinux $(ROOTDEST)
+    endif
+
 	install live_update $(ROOTDEST)/live_update
 	make -C perl-install full_stage2
 	make -C perl-install/share/advertising install
-- 
cgit v1.2.1