Revert "Setup.hs: Better way of handling man page building."

This reverts commit ed061b91c8e3247e1d3b1538eca24687adf0e575.

1 files changed, 8 insertions, 9 deletions

diff --git a/Setup.hs b/Setup.hs
index e2779e65b..4245df203 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -4,7 +4,7 @@ import Distribution.Simple
 import Distribution.Simple.PreProcess
 import Distribution.Simple.Setup
          (copyDest, copyVerbosity, fromFlag, installVerbosity, BuildFlags(..))
-import Distribution.PackageDescription (PackageDescription(..), Executable(..), BuildInfo(..))
+import Distribution.PackageDescription (PackageDescription(..), Executable(..))
 import Distribution.Simple.LocalBuildInfo
          (LocalBuildInfo(..), absoluteInstallDirs)
 import Distribution.Verbosity ( Verbosity, silent )
@@ -19,19 +19,18 @@ import System.Exit
 main :: IO ()
 main = do
   defaultMainWithHooks $ simpleUserHooks {
-      buildHook = \pkgdescr ->
-         (buildHook simpleUserHooks) pkgdescr{ executables =
-            [x | x <- executables pkgdescr,
-                 exeName x /= "make-pandoc-man-pages"] ++
-            [x{ buildInfo = (buildInfo x){ buildable = True } }
-               | x <- executables pkgdescr,
-                 exeName x == "make-pandoc-man-pages"] }
-    , postBuild = makeManPages
+      postBuild = makeManPages
     , postCopy = \ _ flags pkg lbi ->
          installManpages pkg lbi (fromFlag $ copyVerbosity flags)
               (fromFlag $ copyDest flags)
     , postInst = \ _ flags pkg lbi ->
          installManpages pkg lbi (fromFlag $ installVerbosity flags) NoCopyDest
+    , copyHook = \pkgdescr ->
+         (copyHook simpleUserHooks) pkgdescr{ executables =
+            [x | x <- executables pkgdescr, exeName x /= "make-pandoc-man-pages"] }
+    , instHook = \pkgdescr ->
+         (instHook simpleUserHooks) pkgdescr{ executables =
+            [x | x <- executables pkgdescr, exeName x /= "make-pandoc-man-pages"] }
     , hookedPreProcessors = [ppBlobSuffixHandler]
     }
   exitWith ExitSuccess