From 760307483d04aa91d8e4793c037ba149bdc03e36 Mon Sep 17 00:00:00 2001 From: Austin Seipp <austin@well-typed.com> Date: Sat, 7 Mar 2015 11:18:44 -0600 Subject: [PATCH] build: fix 'make help' 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 | 2 +- mk/sub-makefile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2cc62b556684..de9bcf3256d5 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,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 diff --git a/mk/sub-makefile.mk b/mk/sub-makefile.mk index fdaf830eef0b..0ed85c8d56e0 100644 --- a/mk/sub-makefile.mk +++ b/mk/sub-makefile.mk @@ -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 -- GitLab