From owner-svn-src-projects@FreeBSD.ORG  Tue Sep 15 00:26:24 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3ADD4106566B;
	Tue, 15 Sep 2009 00:26:24 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 299E78FC0A;
	Tue, 15 Sep 2009 00:26:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8F0QOLf070643;
	Tue, 15 Sep 2009 00:26:24 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8F0QOel070641;
	Tue, 15 Sep 2009 00:26:24 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <200909150026.n8F0QOel070641@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Tue, 15 Sep 2009 00:26:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197209 - projects/jbuild/usr.bin/make
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Sep 2009 00:26:24 -0000

Author: rodrigc
Date: Tue Sep 15 00:26:23 2009
New Revision: 197209
URL: http://svn.freebsd.org/changeset/base/197209

Log:
  Add a --help option.

Modified:
  projects/jbuild/usr.bin/make/main.c

Modified: projects/jbuild/usr.bin/make/main.c
==============================================================================
--- projects/jbuild/usr.bin/make/main.c	Tue Sep 15 00:15:24 2009	(r197208)
+++ projects/jbuild/usr.bin/make/main.c	Tue Sep 15 00:26:23 2009	(r197209)
@@ -71,6 +71,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/wait.h>
 #include <err.h>
 #include <errno.h>
+#ifdef MAKE_IS_BUILD
+#include <libgen.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -163,11 +166,26 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: make [-BPQSXeiknpqrstv] [-C directory] [-D variable]\n"
+#ifdef MAKE_IS_BUILD
+	    "\n%s MAKE_VERSION: %s, JBUILD_VERSION: %s\n\n"
+#endif
+	    "usage: "
+#ifdef MAKE_IS_BUILD
+	    "%s"
+#else
+	    "make"
+#endif
+	    " [-BPQSXeiknpqrstv] [-C directory] [-D variable]\n"
 	    "\t[-b directory]\n"
 	    "\t[-d flags] [-E variable] [-f makefile] [-I directory]\n"
 	    "\t[-j max_jobs] [-m directory] [-V variable]\n"
-	    "\t[variable=value] [target ...]\n");
+	    "\t[variable=value] [target ...]\n"
+#ifdef MAKE_IS_BUILD
+	    "\n\t[--help] [Display more help and exit.]\n"
+	    , save_argv[0], MAKE_VERSION, JBUILD_VERSION, save_argv[0]);
+#else
+	    );
+#endif
 	exit(2);
 }
 
@@ -387,6 +405,15 @@ rearg:
 		if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
 			found_dd = TRUE;
 		}
+#ifdef MAKE_IS_BUILD
+		if((optind < argc) && (strcmp(argv[optind], "--help") == 0)) {
+			char man_cmd[255];
+			snprintf(man_cmd, sizeof(man_cmd), "man %s",
+			    basename(save_argv[0]));
+			system(man_cmd);
+			exit(2);
+		}
+#endif
 		if ((c = getopt(argc, argv, OPTFLAGS)) == -1) {
 			break;
 		}