From aaed24a4e0d8fa0d49aca167fddfb8b606755e05 Mon Sep 17 00:00:00 2001
From: Thomas Miedema <thomasmiedema@gmail.com>
Date: Sat, 12 Dec 2015 17:02:28 +0100
Subject: Build system: fix 'make install-strip' in bindist

The INSTALL_PROGRAM variable is set in mk/config.mk, so we have to
include that file before using it.

Running 'make install' before './configure' in a bindist will now also
display a nice message.

Reviewers: hvr, austin, bgamari

Reviewed By: bgamari

Differential Revision: https://phabricator.haskell.org/D1604

GHC Trac Issues: #1851
---
 rules/haddock.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rules')

diff --git a/rules/haddock.mk b/rules/haddock.mk
index e716bb8f71..f6978a7462 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -10,11 +10,13 @@
 #
 # -----------------------------------------------------------------------------
 
+ifneq "$(BINDIST)" "YES"
 HADDOCK_VER := $(shell grep "^version:" utils/haddock/haddock.cabal | sed "s/version: *//")
 HADDOCK_MAJOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\1/')
 HADDOCK_MINOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\2/')
 HADDOCK_PATCH_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\3/')
 HADDOCK_VERSION_STRING := $(shell echo $$(($(HADDOCK_MAJOR_VER) * 1000 + $(HADDOCK_MINOR_VER) * 10 + $(HADDOCK_PATCH_VER))))
+endif
 
 define haddock  # args: $1 = dir,  $2 = distdir
 $(call trace, haddock($1,$2))
-- 
cgit v1.2.1