redo system makefile configuration for BSD

SCCS-vsn: usr.bin/make/config.h 5.3
SCCS-vsn: usr.bin/make/main.c 5.3

diff --git a/usr/src/usr.bin/make/config.h b/usr/src/usr.bin/make/config.h
index 464802f..01f3979 100644 (file)
--- a/usr/src/usr.bin/make/config.h
+++ b/usr/src/usr.bin/make/config.h
@@ -19,51 +19,13 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)config.h    5.2 (Berkeley) %G%
+ *     @(#)config.h    5.3 (Berkeley) %G%

  */
 
  */
 

-/*-
- * config.h --
- *     Configuration constants for the local site.
- */
-
-/*
- * DEFSYSPATH
- *     Is the absolute path of the location of system makefiles.
- * SYSPATHDOC
- *     Documentation string to tell what the directory is.
- */
-#define DEFSYSPATH     "/usr/public/lib/pmake"
-#define SYSPATHDOC     "\tDirectory for system makefiles: /usr/public/lib/pmake"
-
-/*
- * DEFSHELL
- *     The index of the default shell description in job.c. It indexes the
- *     'shells' table:
- *         0           C Shell
- *         1           Bourne Shell
- *         2           Unknown
- * SHELLDOC
- *     Documentation string to tell what shell is used by default.
- */
-#define DEFSHELL       1
-#define SHELLDOC       "\tDefault shell: Bourne"
-
-/*
- * DEFSHELLDIR
- *     The directory in which the C Shell and Bourne Shell are to be found.
- */
-#define DEFSHELLDIR    "/bin"
-
-/*
- * DEFSYSMK
- *     The absolute path of the default system makefile. It should probably
- *     be in DEFSYSPATH.
- * SYSMKDOC
- *     Documentation string to tell where the system makefile is.
- */
-#define DEFSYSMK       "/usr/public/lib/pmake/system.mk"
-#define SYSMKDOC       "\tSystem makefile: /usr/public/lib/pmake/system.mk"
+#define        DEFSHELL        1                       /* Bourne shell */
+#define        DEFSHELLDIR     "/bin"                  /* Bourne shell directory */
+#define        DEFSYSMK        "/usr/share/mk/sys.mk"  /* system makefile */
+#define        DEFSYSPATH      "/usr/share/mk"         /* system makefile directory */

 
 /*
  * DEFMAXJOBS
 
 /*
  * DEFMAXJOBS

diff --git a/usr/src/usr.bin/make/main.c b/usr/src/usr.bin/make/main.c
index 59ba461..6761851 100644 (file)
--- a/usr/src/usr.bin/make/main.c
+++ b/usr/src/usr.bin/make/main.c
@@ -27,7 +27,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.3 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -168,10 +168,6 @@ static char            *help[] = {
 #ifdef CAN_EXPORT
 "-x            Allow exportation of commands.",
 #endif
 #ifdef CAN_EXPORT
 "-x            Allow exportation of commands.",
 #endif

-"System configuration information:",
-SYSPATHDOC,
-SHELLDOC,
-SYSMKDOC,

 };
 
 
 };