summaryrefslogtreecommitdiff
path: root/Makefile.distrib
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-06-11 14:33:30 +0000
committerpaltherr <paltherr@epfl.ch>2004-06-11 14:33:30 +0000
commit87b12a10405fbb453e5f5838b70f35972c7822ed (patch)
tree9cb74afa4e12314d14b28d8939794a7abe0e8601 /Makefile.distrib
parentd03b5fd70e6514cd87e15de1fb49b63967857a8d (diff)
downloadscala-87b12a10405fbb453e5f5838b70f35972c7822ed.tar.gz
scala-87b12a10405fbb453e5f5838b70f35972c7822ed.tar.bz2
scala-87b12a10405fbb453e5f5838b70f35972c7822ed.zip
- Added support to merge unix and windows ia bu...
- Added support to merge unix and windows ia builds
Diffstat (limited to 'Makefile.distrib')
-rw-r--r--Makefile.distrib10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.distrib b/Makefile.distrib
index 075d865da4..711bb9628a 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -250,8 +250,11 @@ ia-build-unix :
$(RM) -r $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION)
$(IA) $(IA_BUILD_PREFIX)/$(notdir $(IA_BUILD_PROJECTFILE))
$(INSTALL) -m 755 -d $(IA_INSTALL_PREFIX)
- $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers | \
+ $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers/InstData |\
$(TAR) xf - -C $(IA_INSTALL_PREFIX))
+ $(CHMOD) 644 $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm
+ $(strip $(CP) -a $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm \
+ $(IA_INSTALL_PREFIX)/Web_Installers/install-unix.htm)
ia-build-windows :
$(INSTALL) -m 644 -p $(IA_CONFIG_PREFIX)/tools.zip $(IA_BUILD_PREFIX)
@@ -262,8 +265,11 @@ ia-build-windows :
$(RM) -r $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION)
$(IA) $(IA_BUILD_PREFIX)/$(notdir $(IA_BUILD_PROJECTFILE))
$(INSTALL) -m 755 -d $(IA_INSTALL_PREFIX)
- $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers | \
+ $(strip $(TAR) cf - -C $(IA_BUILD_OUTPUTDIR) Web_Installers/InstData |\
$(TAR) xf - -C $(IA_INSTALL_PREFIX))
+ $(CHMOD) 644 $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm
+ $(strip $(CP) -a $(IA_BUILD_OUTPUTDIR)/Web_Installers/install.htm \
+ $(IA_INSTALL_PREFIX)/Web_Installers/install-windows.htm)
ia-build-all : ia-build-common
ia-build-all : ia-build-unix