diff options
| author | Mystery Man <unknown@mandriva.org> | 2003-08-20 07:37:27 +0000 |
|---|---|---|
| committer | Mystery Man <unknown@mandriva.org> | 2003-08-20 07:37:27 +0000 |
| commit | 7f2ac73888b8ef372ea597049981b27e7d810ac2 (patch) | |
| tree | 354132889b63bbe5f446cb82869b3c3367135a80 /Makefile | |
| parent | 327bd24f8e4291bd1882de1990dd7339f781a9cb (diff) | |
| download | drakx-topic/MDKC_1_0.tar drakx-topic/MDKC_1_0.tar.gz drakx-topic/MDKC_1_0.tar.bz2 drakx-topic/MDKC_1_0.tar.xz drakx-topic/MDKC_1_0.zip | |
This commit was manufactured by cvs2svn to create branch 'MDKC_1_0'.topic/MDKC_1_0
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -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 network.img usb.img blank.img pcmcia.img other.img ka.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 network.img usb.img blank.img other.img ka.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 |