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

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Sun Dec 30 18:11:28 UTC 2007


Author: arjan
Date: Sun Dec 30 18:11:28 2007
New Revision: 856

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=856
Log:
[project @ only-build-setup-if-nonexistent]

Original author: Arjan Oosting <arjanoosting at home.nl>
Date: 2007-09-23 17:32:39+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=856&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_build (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_build Sun Dec 30 18:11:28 2007
@@ -109,14 +109,16 @@
 
 init();
 
-print "Building setup...\n";
+if (! -x "setup" ) {
+    print "Building setup...\n";
 
-my $setup;
-for my $candidate (qw(Setup.lhs Setup.hs)) {
+    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");
 }
-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=856&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_install (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_install Sun Dec 30 18:11:28 2007
@@ -105,13 +105,15 @@
 
 init();
 
-print "Building setup...\n";
-my $setup;
-for my $candidate (qw(Setup.lhs Setup.hs)) {
+if (! -x "setup" ) {
+    print "Building setup...\n";
+    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");
 }
-die unless -e $setup;
-safesystem("ghc6 -package Cabal $setup -o setup");
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
     my $tmp = tmpdir($package);




More information about the Pkg-haskell-commits mailing list