From fa40f30b4253b1e05c46cc5e0c111176825b7623 Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'Corpo_2_1_1'.

---
 Makefile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7d252daa1..2bbe88e06 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
 ifeq (i386,$(ARCH))
-    BOOT_IMG = cdrom.img hd.img network.img usb.img blank.img pcmcia.img other.img
+    BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit_usb.img blank.img pcmcia.img
 endif
 ifeq (sparc,$(ARCH))
     BOOT_IMG  = cdrom.img   hd.img   network.img   live.img   tftp.img   tftprd.img
@@ -19,9 +19,15 @@ endif
 ifeq (ia64,$(ARCH))
     BOOT_IMG = all.img
 endif
+ifeq (x86_64,$(ARCH))
+    BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit.img network_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
@@ -101,9 +112,7 @@ upload_only:
 	upload misc make_mdkinst_stage2 ;\
 	upload misc packdrake ;\
 	upload misc packdrake.pm ;\
-	upload misc rpmtools.pm ;\
 	upload misc auto ;\
-	upload '' live_update ;\
 	upload images MD5SUM ;\
 	upload images *.img* ;\
 	upload images/alternatives '' ;\
-- 
cgit v1.2.1