diff options
| author | michelou <michelou@epfl.ch> | 2004-09-16 11:15:11 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2004-09-16 11:15:11 +0000 |
| commit | 780d8d55b1ec7b4564e008d847909a171ee33baa (patch) | |
| tree | 14fe784ec44348ec98c1439a4feaf34775987420 /Makefile.distrib | |
| parent | 6a315386865fa6d78c7f92d849905c89dcf09d24 (diff) | |
| download | scala-780d8d55b1ec7b4564e008d847909a171ee33baa.tar.gz scala-780d8d55b1ec7b4564e008d847909a171ee33baa.tar.bz2 scala-780d8d55b1ec7b4564e008d847909a171ee33baa.zip | |
- Fixed generation of bat file for new scala_wr...
- Fixed generation of bat file for new scala_wrapper Made ia stuff
- writable by everybody
Diffstat (limited to 'Makefile.distrib')
| -rw-r--r-- | Makefile.distrib | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.distrib b/Makefile.distrib index 960b54f1fa..5ff0fa0f21 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -159,7 +159,7 @@ install-windows : install srcfile="$(PROJECT_SUPPORTDIR)/windows/scala_wrapper"; \ nixfile="$(INSTALL_PREFIX)/bin/$$name"; \ winfile="$(INSTALL_PREFIX)/bin/$$name.bat"; \ - nixexec=`SCALA_EXEC=echo SCALA_CLASSPATH=\"%CLASSPATH%\" $$nixfile`; \ + nixexec=`SCALA_JAVA_CMD="echo java" SCALA_CLASSPATH=\"%CLASSPATH%\" $$nixfile`; \ winexec="$$nixexec"; \ winexec=`echo "$$winexec" | sed -es"#$$root#\"%SCALA_HOME%\"#g"`; \ winexec=`echo "$$winexec" | tr '/' '\\\\' | tr ':' ';'`; \ @@ -171,8 +171,12 @@ install-windows : install $(ECHO) "set COMMAND=$$winexec"; \ $(CAT) "$$srcfile-footer.bat"; \ ) | $(UNIX2DOS) >> "$$winfile"; \ - $(RM) "$$nixfile"; \ echo "done"; \ + done; \ + for name in "" $(SCRIPTS_ALIASES_NAMES); do \ + if [ -z "$$name" ]; then continue; fi; \ + nixfile="$(INSTALL_PREFIX)/bin/$$name"; \ + $(RM) "$$nixfile"; \ done $(RM) $(INSTALL_PREFIX)/bin/.scala_wrapper $(FIND) $(INSTALL_SRCDIR) -type f -exec $(UNIX2DOS) "{}" ";" @@ -290,6 +294,8 @@ ia-build-windows : ia-build-all : ia-build-common ia-build-all : ia-build-unix ia-build-all : ia-build-windows +ia-build-all : + $(CHMOD) -R a+w $(IA_BUILD_PREFIX) .PHONY : ia-build-all .PHONY : ia-build-common |