diff options
| author | Mystery Man <unknown@mandriva.org> | 2003-02-25 09:37:46 +0000 |
|---|---|---|
| committer | Mystery Man <unknown@mandriva.org> | 2003-02-25 09:37:46 +0000 |
| commit | 07dc2ddb40089c216ab4ff323de177ecab8f02ef (patch) | |
| tree | 0b88fcba964e83b283b89aab8740fc3cdcd0d939 /Makefile | |
| parent | 327bd24f8e4291bd1882de1990dd7339f781a9cb (diff) | |
| download | drakx-07dc2ddb40089c216ab4ff323de177ecab8f02ef.tar drakx-07dc2ddb40089c216ab4ff323de177ecab8f02ef.tar.gz drakx-07dc2ddb40089c216ab4ff323de177ecab8f02ef.tar.bz2 drakx-07dc2ddb40089c216ab4ff323de177ecab8f02ef.tar.xz drakx-07dc2ddb40089c216ab4ff323de177ecab8f02ef.zip | |
This commit was manufactured by cvs2svn to create branch
'R9_0-64bit-branch'.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -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 |