From f71044bb1f79f8a0b2f6926b1c04a9592932f1ee Mon Sep 17 00:00:00 2001 From: Johan Tibell <johan.tibell@gmail.com> Date: Sun, 4 Jan 2015 17:45:29 -0500 Subject: [PATCH] Make Makefile work with 1.22 and new server dirs --- Cabal/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cabal/Makefile b/Cabal/Makefile index 823300669d..91aab85c61 100644 --- a/Cabal/Makefile +++ b/Cabal/Makefile @@ -8,7 +8,7 @@ KIND=rc PREFIX=/usr/local HC=ghc GHCFLAGS=-Wall -threaded -SSH_USER=$USER +SSH_USER=$(USER) all: build @@ -96,7 +96,7 @@ $(DIST_STAMP) : $(HADDOCK_STAMP) $(USERGUIDE_STAMP) $(SDIST_STAMP) rm -rf $(DISTLOC) mkdir $(DISTLOC) tar -xzf $(SDIST_STAMP) -C $(DISTLOC)/ - mkdir $(DISTLOC)/Cabal-$(VERSION)/doc + mkdir -p $(DISTLOC)/Cabal-$(VERSION)/doc 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)/ @@ -108,8 +108,8 @@ $(DIST_STAMP) : $(HADDOCK_STAMP) $(USERGUIDE_STAMP) $(SDIST_STAMP) @echo "Release fileset prepared: $(DISTLOC)/" release: $(DIST_STAMP) - 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)' + scp -r $(DISTLOC) $(SSH_USER)@haskell.org:/home/web/haskell.org/cabal/release/cabal-$(VERSION) + ssh $(SSH_USER)@haskell.org 'cd /home/web/haskell.org/cabal/release && rm -f $(KIND) && ln -s cabal-$(VERSION) $(KIND)' # tags... -- GitLab