[commit: ghc] master: Make cabal01 pass with Cabal 1.18 (#8738). (be2e0e8)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/be2e0e88d7ddd33eef8277c8d67f0b0f3e2874be/ghc

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

commit be2e0e88d7ddd33eef8277c8d67f0b0f3e2874be
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Tue Mar 4 08:02:36 2014 +0100

    Make cabal01 pass with Cabal 1.18 (#8738).
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

be2e0e88d7ddd33eef8277c8d67f0b0f3e2874be
 testsuite/tests/cabal/cabal01/Makefile |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
index b18d8fc..f1b74b4 100644
--- a/testsuite/tests/cabal/cabal01/Makefile
+++ b/testsuite/tests/cabal/cabal01/Makefile
@@ -28,7 +28,7 @@ cabal01:
 # we get a warning if dynlibs are enabled by default that:
 # 	Warning: -rtsopts and -with-rtsopts have no effect with -shared.
 # so we filter the flag out
-	./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(VANILLA) $(PROF) $(DYN)
+	./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(VANILLA) $(PROF) $(DYN) --libsubdir='$$pkgid'
 	./setup build -v0
 	./setup copy -v0
 	echo install1:
@@ -42,4 +42,3 @@ cabal01:
 	echo dist:
 	ls -1 dist
 	if [ "$(CLEANUP)" != "" ]; then $(MAKE) clean; fi
-