[Pkg-cli-apps-commits] [fsharp] 58/71: merge latest fixes from master

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to tag 3.1.0
in repository fsharp.

commit e1cf39530433e883bfe2f918cfb27f604c26ab33
Merge: 58e5c97 b3e994b
Author: Don Syme <donsyme at fastmail.fm>
Date:   Mon Dec 23 19:46:20 2013 +0100

    merge latest fixes from master

 .gitignore              | 3 +++
 src/fsharp/targets.make | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/fsharp/targets.make
index 06ad739,ee8cc10..8cc594f
--- a/src/fsharp/targets.make
+++ b/src/fsharp/targets.make
@@@ -101,7 -221,8 +101,8 @@@ install-lib-net45
  
  # The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile
  # This also installs 'fsharpc' and 'fsharpi'
 -install-bin-4:
 +install-bin:
+ 	chmod +x $(outdir)$(ASSEMBLY)
  	sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
  	chmod +x $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
  	@mkdir -p $(DESTDIR)$(gacdir)/$(TARGET)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git