summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-05 16:13:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-05 16:13:00 +0000
commit090d765b3f59ae12ac39d9392da95749f5415e4a (patch)
tree31810def3eecf14c55b7ae0f53a0f5513fa370f2
parent7d04cbc89f47233b83ddb520dca80b4391055358 (diff)
downloaddrakx-090d765b3f59ae12ac39d9392da95749f5415e4a.tar
drakx-090d765b3f59ae12ac39d9392da95749f5415e4a.tar.gz
drakx-090d765b3f59ae12ac39d9392da95749f5415e4a.tar.bz2
drakx-090d765b3f59ae12ac39d9392da95749f5415e4a.tar.xz
drakx-090d765b3f59ae12ac39d9392da95749f5415e4a.zip
no_comment
-rw-r--r--Makefile5
-rw-r--r--perl-install/install2.pm2
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ef97a4c55..0ef23e953 100644
--- a/Makefile
+++ b/Makefile
@@ -88,15 +88,14 @@ clean:
for i in $(DIRS) rescue; do make -C $$i clean; done
find . -name "*~" -o -name ".#*" | xargs rm -f
-upload: tar install
+upload: install
touch /tmp/mdkinst_done
cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst
lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/images ; mput $(ROOTDEST)/images/*.img"
lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd $(UPLOAD_DEST)/Mandrake/base ; lcd $(ROOTDEST)/Mandrake/base ; put mdkinst_stage2.gz rescue_stage2.gz compss compssList compssUsers hdlists ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2" #,gendepslist,rpm2header"
lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/dosutils/autoboot/mdkinst ; put $(ROOTDEST)/dosutils/autoboot/mdkinst/vmlinuz ; mput $(ROOTDEST)/dosutils/autoboot/mdkinst/initrd.*"
- lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/lnx4win ; lcd $(ROOTDEST)/lnx4win ; put initrd.gz vmlinuz"
- lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST_CONTRIB)/others/src ; put ../gi.tar.bz2"
+# lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST_CONTRIB)/others/src ; put ../gi.tar.bz2"
rm -f $(ROOTDEST)/Mandrake/mdkinst.tgz
rm -f /tmp/mdkinst_done
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index cd3d7c464..538ea1cbd 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -330,7 +330,7 @@ sub formatPartitions {
my $d = "/initrd/loopfs/lnx4win";
if (-d $d) {
#- install_any::useMedium(0);
- install_any::getAndSaveFile("lnx4win/$_", "$d/$_") foreach qw(loadlin.exe linux.pif lnx4win.exe lnx4win.ico);
+ install_any::getAndSaveFile("lnx4win/$_", "$d/$_") foreach qw(loadlin.exe linux.pif lnx4win.exe lnx4win.ico rm.exe uninstall.bat uninstall.pif);
}
#- chdir "$o->{prefix}"; was for core dumps