From: Ian Lynagh <igloo@earth.li>
Date: Sun, 17 Aug 2008 11:31:28 +0000 (+0000)
Subject: Avoid scary "Package contains no library to register" message in installPackage
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9520de572cb08531b67b07569bd30c3ed27d9f94;p=ghc-hetmet.git

Avoid scary "Package contains no library to register" message in installPackage
We only call register if we actually have a library to be registered
---

diff --git a/utils/installPackage/installPackage.hs b/utils/installPackage/installPackage.hs
index 3e86ff0..f36fd23 100644
--- a/utils/installPackage/installPackage.hs
+++ b/utils/installPackage/installPackage.hs
@@ -1,4 +1,5 @@
 
+import Control.Monad
 import Data.Maybe
 import Distribution.PackageDescription
 import Distribution.PackageDescription.Parse
@@ -124,7 +125,11 @@ doInstall verbosity distPref enableShellWrappers strip
               lbi_reg = lbi { installDirTemplates = i_reg,
                               withPrograms = progs' }
           (copyHook simpleUserHooks) pd     lbi_copy userHooks copyFlags
-          (regHook simpleUserHooks)  pd_reg lbi_reg  userHooks registerFlags
+          -- Cabal prints a scary "Package contains no library to register"
+          -- message if we call register but this is an executable package.
+          -- We therefore don't call it if we don't have a library for it.
+          when (isJust (library pd_reg)) $
+            (regHook simpleUserHooks)  pd_reg lbi_reg  userHooks registerFlags
           return ()
 
 replaceTopdir :: FilePath -> FilePath -> FilePath