summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-24 16:45:10 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-24 16:45:10 +0000
commit96a44ec69287273eaa346a8ebc3dafea651a4d1e (patch)
tree12a8a195e6599ef0b2db091bf8e82aa5995220ba /Makefile
parent851ca8f056135ff7edd9c19705ba2a4870887775 (diff)
downloaddrakx-96a44ec69287273eaa346a8ebc3dafea651a4d1e.tar
drakx-96a44ec69287273eaa346a8ebc3dafea651a4d1e.tar.gz
drakx-96a44ec69287273eaa346a8ebc3dafea651a4d1e.tar.bz2
drakx-96a44ec69287273eaa346a8ebc3dafea651a4d1e.tar.xz
drakx-96a44ec69287273eaa346a8ebc3dafea651a4d1e.zip
no_comment
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 939a35ee9..a1ace510a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
BOOT_IMG = gi_hd.img gi_cdrom.img gi_network.img gi_network_ks.img gi_pcmcia.img gi_pcmcia_ks.img
BINS = install/install install/local-install install/installinit/init
-DIRS = install install/installinit mouseconfig perl-install lnx4win
+DIRS = tools install install/installinit mouseconfig perl-install lnx4win
ROOTDEST = /export
@@ -16,7 +16,7 @@ build: $(BOOT_IMG)
dirs:
for i in $(DIRS); do make -C $$i; done
-$(BOOT_IMG): modules dirs
+$(BOOT_IMG): dirs modules
./make_boot_img $@ $(@:gi_%.img=%)
tar: clean
@@ -39,9 +39,9 @@ upload: tar install
touch /tmp/mdkinst_done
cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst
-# lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/cooker/images ; mput $(ROOTDEST)/images/gi_*.img"
+ lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/cooker/images ; mput $(ROOTDEST)/images/gi_*.img"
lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd ~/cooker/cooker/Mandrake/base ; put $(ROOTDEST)/Mandrake/base/mdkinst_stage2.gz ; put ~/gi/perl-install/compss ; put ~/gi/perl-install/compssList ; put ~/gi/perl-install/compssUsers ; cd ~/cooker/cooker/misc ; put ~/gi/tools/make_mdkinst_stage2 "
-# lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ~/gi.tar.bz2"
+ lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ~/gi.tar.bz2"
rm -f $(ROOTDEST)/Mandrake/mdkinst.tgz
rm -f /tmp/mdkinst_done