summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/mk/bsd.doc.mk5
-rw-r--r--share/mk/bsd.info.mk5
-rw-r--r--share/mk/bsd.kmod.mk5
-rw-r--r--share/mk/bsd.lib.mk5
-rw-r--r--share/mk/bsd.man.mk9
-rw-r--r--share/mk/bsd.prog.mk5
-rw-r--r--share/mk/bsd.sgml.mk5
-rw-r--r--share/mk/bsd.subdir.mk8
-rw-r--r--sys/conf/kmod.mk5
9 files changed, 43 insertions, 9 deletions
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index b4603e9..1ba17c3 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.doc.mk 5.3 (Berkeley) 1/2/91
-# $Id: bsd.doc.mk,v 1.44 1998/05/06 18:44:00 bde Exp $
+# $Id: bsd.doc.mk,v 1.45 1998/08/02 13:50:23 bde Exp $
#
# The include file <bsd.doc.mk> handles installing BSD troff documents.
#
@@ -14,9 +14,12 @@
#
# [incomplete]
+.if !target(__initialized__)
+__initialized__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.endif
PRINTERDEVICE?= ascii
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 29f9da6..2257c59 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-# $Id: bsd.info.mk,v 1.49 1998/03/12 20:02:09 eivind Exp $
+# $Id: bsd.info.mk,v 1.50 1998/05/06 18:44:01 bde Exp $
#
# The include file <bsd.info.mk> handles installing GNU (tech)info files.
# Texinfo is a documentation system that uses a single source
@@ -76,9 +76,12 @@
#
# bsd.obj.mk: cleandir and obj
+.if !target(__initialized__)
+__initialized__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.endif
MAKEINFO?= makeinfo
MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index 3d97b72..229923b 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $Id: bsd.kmod.mk,v 1.49 1998/06/09 02:55:40 bde Exp $
+# $Id: bsd.kmod.mk,v 1.50 1998/07/29 14:19:48 bde Exp $
#
# The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
#
@@ -81,9 +81,12 @@
MODLOAD?= /sbin/modload
MODUNLOAD?= /sbin/modunload
+.if !target(__initialized__)
+__initialized__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.endif
.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index bbabf5e..eef7265 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,10 +1,13 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $Id: bsd.lib.mk,v 1.73 1998/06/04 15:15:38 peter Exp $
+# $Id: bsd.lib.mk,v 1.74 1998/06/05 18:38:54 dt Exp $
#
+.if !target(__initialized__)
+__initialized__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.endif
# Default executable format
.if ${MACHINE} == "alpha"
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 44e720e..7a79e6f 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-# $Id: bsd.man.mk,v 1.26 1997/11/09 15:03:14 wosch Exp $
+# $Id: bsd.man.mk,v 1.27 1998/04/27 15:08:07 bde Exp $
#
# The include file <bsd.man.mk> handles installing manual pages and
# their links.
@@ -52,6 +52,13 @@
# Install the manual pages and their links.
#
+.if !target(__initialized__)
+__initialized__:
+.if exists(${.CURDIR}/../Makefile.inc)
+.include "${.CURDIR}/../Makefile.inc"
+.endif
+.endif
+
MANSRC?= ${.CURDIR}
MINSTALL= ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index e35df86..9336988 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,9 +1,12 @@
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $Id: bsd.prog.mk,v 1.74 1998/05/15 09:34:48 bde Exp $
+# $Id: bsd.prog.mk,v 1.75 1998/06/05 18:38:54 dt Exp $
+.if !target(__initialized__)
+__initialized__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.endif
# Default executable format
BINFORMAT?= aout
diff --git a/share/mk/bsd.sgml.mk b/share/mk/bsd.sgml.mk
index 83b8918..39a117a 100644
--- a/share/mk/bsd.sgml.mk
+++ b/share/mk/bsd.sgml.mk
@@ -1,7 +1,7 @@
# bsd.sgml.mk - 8 Sep 1995 John Fieber
# This file is in the public domain.
#
-# $Id: bsd.sgml.mk,v 1.24 1998/05/06 18:44:04 bde Exp $
+# $Id: bsd.sgml.mk,v 1.25 1998/05/18 16:57:10 wosch Exp $
#
# The include file <bsd.sgml.mk> handles installing sgml documents.
#
@@ -51,9 +51,12 @@
#
+.if !target(__initialized__)
+__initialized__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.endif
# FORMATS indicates which output formats will be generated. See
# the sgmlfmt(1) man page for a list of valid formats.
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 1b712d4..5a5cc1a 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
-# $Id: bsd.subdir.mk,v 1.23 1998/03/29 01:10:09 eivind Exp $
+# $Id: bsd.subdir.mk,v 1.24 1998/05/06 16:53:53 wosch Exp $
#
# The include file <bsd.subdir.mk> contains the default targets
# for building subdirectories.
@@ -36,6 +36,12 @@
# obj, objlink, realinstall, regress, tags
#
+.if !target(__initialized__)
+__initialized__:
+.if exists(${.CURDIR}/../Makefile.inc)
+.include "${.CURDIR}/../Makefile.inc"
+.endif
+.endif
.MAIN: all
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 3d97b72..229923b 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $Id: bsd.kmod.mk,v 1.49 1998/06/09 02:55:40 bde Exp $
+# $Id: bsd.kmod.mk,v 1.50 1998/07/29 14:19:48 bde Exp $
#
# The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
#
@@ -81,9 +81,12 @@
MODLOAD?= /sbin/modload
MODUNLOAD?= /sbin/modunload
+.if !target(__initialized__)
+__initialized__:
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
+.endif
.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
OpenPOWER on IntegriCloud