build: fix 'make help'
authorAustin Seipp <austin@well-typed.com>
Sat, 7 Mar 2015 17:18:44 +0000 (11:18 -0600)
committerAustin Seipp <austin@well-typed.com>
Sat, 7 Mar 2015 17:18:44 +0000 (11:18 -0600)
Summary:
This fixes the usage of `make help` in the top-level and subdirectories.

Signed-off-by: Austin Seipp <austin@well-typed.com>
Test Plan: It worked now and didn't before.

Reviewers: hvr

Reviewed By: hvr

Subscribers: thomie

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

Makefile
mk/sub-makefile.mk

index 60853bc..83ef07c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ default : all
 # For help, type 'make help'
 .PHONY: help
 help:
-       @cat MAKEHELP
+       @cat MAKEHELP.md
 
 ifneq "$(filter maintainer-clean distclean clean help,$(MAKECMDGOALS))" ""
 -include mk/config.mk
index fdaf830..0ed85c8 100644 (file)
@@ -59,4 +59,4 @@ help : sub-help
 sub-help :
        @echo "You are in subdirectory \"$(dir)\"."
        @echo "Useful targets in this directory:"
-       @cat $(TOP)/SUBMAKEHELP
+       @sed '1,/Using `make` in subdirectories/d' $(TOP)/MAKEHELP.md