diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-06-12 14:10:44 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-06-12 14:10:44 +0000 |
| commit | 014a65964c200155ec01d633c8653c3840cec9c2 (patch) | |
| tree | 2a0f56e94e232bb3be8563f3a80fe45bbeaf4c53 /Makefile | |
| parent | 726052354a8a77b85e11c620e3c9fbe98522ff57 (diff) | |
| download | drakx-014a65964c200155ec01d633c8653c3840cec9c2.tar drakx-014a65964c200155ec01d633c8653c3840cec9c2.tar.gz drakx-014a65964c200155ec01d633c8653c3840cec9c2.tar.bz2 drakx-014a65964c200155ec01d633c8653c3840cec9c2.tar.xz drakx-014a65964c200155ec01d633c8653c3840cec9c2.zip | |
merge with x86_64-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 hd.img network.img usb.img blank.img other.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 |