[Pkg-haskell-commits] r815 - in /packages/haskell-devscripts/trunk: dh_haskell_build dh_haskell_install

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Dec 30 18:08:36 2007
New Revision: 815

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=815
Log:
[project @ Detect whether to use Setup.lhs or Setup.hs]

Original author: Florian Ragwitz <florian.ragwitz at s2004.tu-chemnitz.de>
Date: 2005-08-23 15:20:08+00:00

Modified:
    packages/haskell-devscripts/trunk/dh_haskell_build
    packages/haskell-devscripts/trunk/dh_haskell_install

Modified: packages/haskell-devscripts/trunk/dh_haskell_build
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_build?rev=815&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_build (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_build Sun Dec 30 18:08:36 2007
@@ -169,7 +169,13 @@
 }
 
 print "Building setup...\n";
-safesystem("ghc6 -package Cabal Setup.lhs -o setup");
+
+my $setup;
+for my $candidate (qw(Setup.lhs Setup.hs)) {
+	$setup = $candidate, last if -e $candidate;
+}
+die unless -e $setup;
+safesystem("ghc6 -package Cabal $setup -o setup");
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
     my $tmp = tmpdir($package);

Modified: packages/haskell-devscripts/trunk/dh_haskell_install
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_install?rev=815&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_install (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_install Sun Dec 30 18:08:36 2007
@@ -169,7 +169,12 @@
 }
 
 print "Building setup...\n";
-safesystem("ghc6 -package Cabal Setup.lhs -o setup");
+my $setup;
+for my $candidate (qw(Setup.lhs Setup.hs)) {
+	$setup = $candidate, last if -e $candidate;
+}
+die unless -e $setup;
+safesystem("ghc6 -package Cabal $setup -o setup");
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
     my $tmp = tmpdir($package);