summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 16:41:21 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 16:41:21 +0000
commit809ea7bf3deca015520b7b324a647d6a2e2c287d (patch)
tree22227484f58331569f55b171d611cf3016bfad8d /Makefile
parente7e3129dfc54432e08ed55873ffc52b84f1f588c (diff)
downloaddrakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar.gz
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar.bz2
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.tar.xz
drakx-809ea7bf3deca015520b7b324a647d6a2e2c287d.zip
Merge from AMD64 branch, also fix all.rdz generation.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bf3be1501..774465189 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,15 @@ endif
ifeq (ia64,$(ARCH))
BOOT_IMG = all.img
endif
+ifeq (x86_64,$(ARCH))
+ BOOT_IMG = BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit_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