summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorNicolas Planel <nplanel@mandriva.com>2003-10-29 16:07:11 +0000
committerNicolas Planel <nplanel@mandriva.com>2003-10-29 16:07:11 +0000
commitde47eb59bb829423b1d0f47ba13099073999b3cb (patch)
tree827f35c4666e15ec66edae7c1fa05d963324602b /Makefile
parent1fece42e9c460ca017fc4facad380f05163d8977 (diff)
downloaddrakx-de47eb59bb829423b1d0f47ba13099073999b3cb.tar
drakx-de47eb59bb829423b1d0f47ba13099073999b3cb.tar.gz
drakx-de47eb59bb829423b1d0f47ba13099073999b3cb.tar.bz2
drakx-de47eb59bb829423b1d0f47ba13099073999b3cb.tar.xz
drakx-de47eb59bb829423b1d0f47ba13099073999b3cb.zip
Corporate Server 2.1.1 releasetopic/Corpo_2_1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 13 insertions, 4 deletions
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 '' ;\