BSD 4_4 release

[unix-history] / usr / src / usr.bin / make / config.h

diff --git a/usr/src/usr.bin/make/config.h b/usr/src/usr.bin/make/config.h
index d828724..c00ee33 100644 (file)
--- a/usr/src/usr.bin/make/config.h
+++ b/usr/src/usr.bin/make/config.h
@@ -1,31 +1,44 @@
 /*
 /*

- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * Copyright (c) 1988, 1989 by Adam de Boor
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)config.h    5.6 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)config.h    8.1 (Berkeley) 6/6/93

  */
 
 #define        DEFSHELL        1                       /* Bourne shell */
  */
 
 #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


@@ -51,14 +64,6 @@
 #define INCLUDES
 #define LIBRARIES
 
 #define INCLUDES
 #define LIBRARIES
 

-/*
- * DEF_OLD_VARS
- *     If defined, variable substitution follows the make style. PMake-style
- *     substitution cannot be turned on. In addition, pmake will never
- *     generate a warning for an undefined variable.
- */
-/*#define DEF_OLD_VARS*/
-

 /*
  * LIBSUFF
  *     Is the suffix used to denote libraries and is used by the Suff module
 /*
  * LIBSUFF
  *     Is the suffix used to denote libraries and is used by the Suff module


@@ -80,4 +85,8 @@
  */
 #define        LIBSUFF ".a"
 #define        RECHECK
  */
 #define        LIBSUFF ".a"
 #define        RECHECK

+
+#ifndef RANLIBMAG
+#define RANLIBMAG "__.SYMDEF"
+#endif

 /*#define POSIX*/
 /*#define POSIX*/