[commit: packages/Cabal] ghc-head: Fix Makefile on OS X (0bb05bc)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/packages/Cabal.git/commitdiff/0bb05bcb4d0cecf13e1269450131535750876849

>---------------------------------------------------------------

commit 0bb05bcb4d0cecf13e1269450131535750876849
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Fri Sep 20 13:09:13 2013 -0700

    Fix Makefile on OS X
    
    tar on OS X didn't like
    
        tar -c file -zf file.tar.gz
    
    but does accept
    
        tar -czf file.tar.gz file
    
    Also added an option to use a different SSH user.
    
    (cherry picked from commit 879b6e3b8fc43a69ac29b3ae4e222a24b9316dd1)


>---------------------------------------------------------------

0bb05bcb4d0cecf13e1269450131535750876849
 Cabal/Makefile |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cabal/Makefile b/Cabal/Makefile
index 4ff5ad5..9aa29a8 100644
--- a/Cabal/Makefile
+++ b/Cabal/Makefile
@@ -1,5 +1,5 @@
 
-VERSION=1.18.0
+VERSION=1.18.1
 
 #KIND=devel
 KIND=rc
@@ -8,6 +8,7 @@ KIND=rc
 PREFIX=/usr/local
 HC=ghc
 GHCFLAGS=-Wall
+SSH-USER=tibbe
 
 all: build
 
@@ -115,7 +116,7 @@ $(DIST_STAMP) : $(HADDOCK_STAMP) $(USERGUIDE_STAMP) $(SDIST_STAMP)
 	cp -r dist/doc/html $(DISTLOC)/Cabal-$(VERSION)/doc/API
 	cp -r dist/doc/users-guide $(DISTLOC)/Cabal-$(VERSION)/doc/
 	cp changelog $(DISTLOC)/Cabal-$(VERSION)/
-	tar -C $(DISTLOC) -c Cabal-$(VERSION) -zf $(DISTLOC)/Cabal-$(VERSION).tar.gz
+	tar -C $(DISTLOC) -czf $(DISTLOC)/Cabal-$(VERSION).tar.gz Cabal-$(VERSION)
 	mv $(DISTLOC)/Cabal-$(VERSION)/doc $(DISTLOC)/
 	mv $(DISTLOC)/Cabal-$(VERSION)/changelog $(DISTLOC)/
 	rm -r $(DISTLOC)/Cabal-$(VERSION)/
@@ -123,8 +124,8 @@ $(DIST_STAMP) : $(HADDOCK_STAMP) $(USERGUIDE_STAMP) $(SDIST_STAMP)
 	@echo "Release fileset prepared: $(DISTLOC)/"
 
 release: $(DIST_STAMP)
-	scp -r $(DISTLOC) haskell.org:/srv/web/haskell.org/cabal/release/cabal-$(VERSION)
-	ssh haskell.org 'cd /srv/web/haskell.org/cabal/release && rm -f $(KIND) && ln -s cabal-$(VERSION) $(KIND)'
+	scp -r $(DISTLOC) $(SSH-USER)@haskell.org:/srv/web/haskell.org/cabal/release/cabal-$(VERSION)
+	ssh $(SSH-USER)@haskell.org 'cd /srv/web/haskell.org/cabal/release && rm -f $(KIND) && ln -s cabal-$(VERSION) $(KIND)'
 
 # tags...