summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-03 04:41:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-03 04:41:34 +0000
commit495805d2bd3d9deec6ecc3e6aa31ce0d6d1ee101 (patch)
tree84fcc34da20fb8263de16be79452079219cfcdf8
parentcd779f46286d9b3cc28aff20a0484190a5255f04 (diff)
downloaddrakx-backup-do-not-use-495805d2bd3d9deec6ecc3e6aa31ce0d6d1ee101.tar
drakx-backup-do-not-use-495805d2bd3d9deec6ecc3e6aa31ce0d6d1ee101.tar.gz
drakx-backup-do-not-use-495805d2bd3d9deec6ecc3e6aa31ce0d6d1ee101.tar.bz2
drakx-backup-do-not-use-495805d2bd3d9deec6ecc3e6aa31ce0d6d1ee101.tar.xz
drakx-backup-do-not-use-495805d2bd3d9deec6ecc3e6aa31ce0d6d1ee101.zip
move back isolinux in ROOTDEST instead of ROOTDEST/install
(since the isolinux directory must be at the root of cds)
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7517a4ebd..b7fca6771 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,13 @@ install_only:
cd $(IMAGES_DEST); md5sum *.{img,iso}* > MD5SUM
ifeq (i386,$(ARCH))
- rm -rf $(GENERIC_INSTALL_DEST)/isolinux
- cp -af isolinux $(GENERIC_INSTALL_DEST)
+ rm -rf $(ROOTDEST)/isolinux
+ cp -af isolinux $(ROOTDEST)
endif
ifeq (x86_64,$(ARCH))
- rm -rf $(GENERIC_INSTALL_DEST)/isolinux
- cp -af isolinux $(GENERIC_INSTALL_DEST)
+ rm -rf $(ROOTDEST)/isolinux
+ cp -af isolinux $(ROOTDEST)
endif
make -C perl-install full_stage2
@@ -82,7 +82,7 @@ upload_only:
upload $(IMAGES_DEST) '*.img*' ;\
upload $(IMAGES_DEST) '*.iso*' ;\
upload $(IMAGES_DEST)/alternatives '' ;\
- upload $(GENERIC_INSTALL_DEST)/isolinux '' ;\
+ upload $(ROOTDEST)/isolinux '' ;\
echo
isolinux-graphic.bmp.parameters: isolinux-graphic.bmp isolinux