usr.sbin, make sure subdirs of subdirs see usr.sbin/Makefile.inc:

Does the same thing as lpr/pac and pppd/pppstats. I have no idea if
this is the right way, but it seems to work. Cluebats welcome.

diff --git usr.sbin/lpr/filters/Makefile usr.sbin/lpr/filters/Makefile
index be83507..7308625 100644
--- usr.sbin/lpr/filters/Makefile
+++ usr.sbin/lpr/filters/Makefile
@@ -5,4 +5,5 @@ PROG=   lpf
 NOMAN= noman
 BINDIR=        /usr/libexec/lpr
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/lpr/lpq/Makefile usr.sbin/lpr/lpq/Makefile
index dcf9ec8..5829802 100644
--- usr.sbin/lpr/lpq/Makefile
+++ usr.sbin/lpr/lpq/Makefile
@@ -9,4 +9,5 @@ BINMODE=2555
 BINDIR=        /usr/bin
 .PATH: ${.CURDIR}/../common_source
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/lpr/lpr/Makefile usr.sbin/lpr/lpr/Makefile
index 29f2cdd..64fe2af 100644
--- usr.sbin/lpr/lpr/Makefile
+++ usr.sbin/lpr/lpr/Makefile
@@ -10,4 +10,5 @@ BINMODE=6555
 BINDIR=        /usr/bin
 .PATH: ${.CURDIR}/../common_source
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/lpr/lprm/Makefile usr.sbin/lpr/lprm/Makefile
index 556e16a..56ebd79 100644
--- usr.sbin/lpr/lprm/Makefile
+++ usr.sbin/lpr/lprm/Makefile
@@ -10,4 +10,5 @@ BINMODE=6555
 BINDIR=        /usr/bin
 .PATH: ${.CURDIR}/../common_source
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/mopd/mopa.out/Makefile usr.sbin/mopd/mopa.out/Makefile
index 6831136..5d37cea 100644
--- usr.sbin/mopd/mopa.out/Makefile
+++ usr.sbin/mopd/mopa.out/Makefile
@@ -7,4 +7,5 @@ SRCS=   mopa.out.c file.c
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common
 .PATH: ${.CURDIR}/../common
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/mopd/mopchk/Makefile usr.sbin/mopd/mopchk/Makefile
index 99f0b25..64514af 100644
--- usr.sbin/mopd/mopchk/Makefile
+++ usr.sbin/mopd/mopchk/Makefile
@@ -16,4 +16,5 @@ version.c version.h: ${.CURDIR}/../common/VERSION
                  echo '#define VERSION_MINOR' $$2 ; } > version.h
 
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/mopd/mopd/Makefile usr.sbin/mopd/mopd/Makefile
index 196d563..13d50ff 100644
--- usr.sbin/mopd/mopd/Makefile
+++ usr.sbin/mopd/mopd/Makefile
@@ -18,4 +18,5 @@ version.c version.h: ${.CURDIR}/../common/VERSION
                  echo '#define VERSION_MINOR' $$2 ; } > version.h
 
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/mopd/mopprobe/Makefile usr.sbin/mopd/mopprobe/Makefile
index 75ba3d0..c5ae7ca 100644
--- usr.sbin/mopd/mopprobe/Makefile
+++ usr.sbin/mopd/mopprobe/Makefile
@@ -16,4 +16,5 @@ version.c version.h: ${.CURDIR}/../common/VERSION
                { echo '#define VERSION_MAJOR' $$1 ; \
                  echo '#define VERSION_MINOR' $$2 ; } > version.h
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/mopd/moptrace/Makefile usr.sbin/mopd/moptrace/Makefile
index 187d2ea..ca0226b 100644
--- usr.sbin/mopd/moptrace/Makefile
+++ usr.sbin/mopd/moptrace/Makefile
@@ -17,5 +17,5 @@ version.c version.h: ${.CURDIR}/../common/VERSION
                { echo '#define VERSION_MAJOR' $$1 ; \
                  echo '#define VERSION_MINOR' $$2 ; } > version.h
 
-
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/mopd/otherOS/Makefile usr.sbin/mopd/otherOS/Makefile
index 7278108..5cee108 100644
--- usr.sbin/mopd/otherOS/Makefile
+++ usr.sbin/mopd/otherOS/Makefile
@@ -236,3 +236,5 @@ version.c version.h: VERSION
                  echo '#define VERSION_MINOR' $$2 ; } > version.h
 
 force: /tmp
+
+.include "../../Makefile.inc"
diff --git usr.sbin/npppd/npppd/Makefile usr.sbin/npppd/npppd/Makefile
index 421db5b..36affc9 100644
--- usr.sbin/npppd/npppd/Makefile
+++ usr.sbin/npppd/npppd/Makefile
@@ -49,5 +49,6 @@ CPPFLAGS+=    -DPAP_DEBUG=1 -DCHAP_DEBUG=1
 CPPFLAGS+=     -DNPPPD_IFACE_DEBUG
 .endif
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
 .PATH: ${.CURDIR}/../common
diff --git usr.sbin/smtpd/makemap/Makefile usr.sbin/smtpd/makemap/Makefile
index bd89f4d..eca5025 100644
--- usr.sbin/smtpd/makemap/Makefile
+++ usr.sbin/smtpd/makemap/Makefile
@@ -27,4 +27,5 @@ SRCS+=        table_proc.c
 
 DPADD+= ${LIBUTIL} ${LIBCRYPTO} ${LIBZ}
 LDADD+= -lutil -lcrypto -lz
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/smtpd/smtpctl/Makefile usr.sbin/smtpd/smtpctl/Makefile
index ecaa63a..9518f55 100644
--- usr.sbin/smtpd/smtpctl/Makefile
+++ usr.sbin/smtpd/smtpctl/Makefile
@@ -25,4 +25,6 @@ SRCS+=        to.c expand.c tree.c dict.c
 
 LDADD+=        -lutil -lz -lcrypto
 DPADD+=        ${LIBUTIL} ${LIBZ} ${LIBCRYPTO}
+
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/smtpd/smtpd/Makefile usr.sbin/smtpd/smtpd/Makefile
index eaea690..91643c0 100644
--- usr.sbin/smtpd/smtpd/Makefile
+++ usr.sbin/smtpd/smtpd/Makefile
@@ -49,4 +49,5 @@ CFLAGS+=      -DIO_SSL
 CFLAGS+=       -DQUEUE_PROFILING
 YFLAGS=
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/smtpd/table-ldap/Makefile usr.sbin/smtpd/table-ldap/Makefile
index 1bfabbe..e06a82a 100644
--- usr.sbin/smtpd/table-ldap/Makefile
+++ usr.sbin/smtpd/table-ldap/Makefile
@@ -26,4 +26,5 @@ CFLAGS+=      -Wsign-compare
 CFLAGS+=       -DNO_IO
 #CFLAGS+=      -Werror # during development phase (breaks some archs) 
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/smtpd/table-passwd/Makefile 
usr.sbin/smtpd/table-passwd/Makefile
index 3b65b5a..d3e778d 100644
--- usr.sbin/smtpd/table-passwd/Makefile
+++ usr.sbin/smtpd/table-passwd/Makefile
@@ -24,4 +24,5 @@ CFLAGS+=      -Wsign-compare
 CFLAGS+=       -DNO_IO
 #CFLAGS+=      -Werror # during development phase (breaks some archs) 
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/smtpd/table-sqlite/Makefile 
usr.sbin/smtpd/table-sqlite/Makefile
index 41062e4..4603a87 100644
--- usr.sbin/smtpd/table-sqlite/Makefile
+++ usr.sbin/smtpd/table-sqlite/Makefile
@@ -24,4 +24,5 @@ CFLAGS+=      -Wsign-compare
 CFLAGS+=       -DNO_IO
 #CFLAGS+=      -Werror # during development phase (breaks some archs) 
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/makedbm/Makefile usr.sbin/ypserv/makedbm/Makefile
index 42f7396..7c8d044 100644
--- usr.sbin/ypserv/makedbm/Makefile
+++ usr.sbin/ypserv/makedbm/Makefile
@@ -6,4 +6,5 @@ MAN=    makedbm.8
 .PATH: ${.CURDIR}/../common
 CFLAGS+=-I${.CURDIR}/../common
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/mkalias/Makefile usr.sbin/ypserv/mkalias/Makefile
index 1948251f..b496d9f 100644
--- usr.sbin/ypserv/mkalias/Makefile
+++ usr.sbin/ypserv/mkalias/Makefile
@@ -6,4 +6,5 @@ MAN=    mkalias.8
 .PATH: ${.CURDIR}/../common
 CFLAGS+=-I${.CURDIR}/../common
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/mknetid/Makefile usr.sbin/ypserv/mknetid/Makefile
index 60aa0c2..e9fccee 100644
--- usr.sbin/ypserv/mknetid/Makefile
+++ usr.sbin/ypserv/mknetid/Makefile
@@ -3,4 +3,5 @@
 PROG=  mknetid
 MAN=   mknetid.8 netid.5
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/revnetgroup/Makefile 
usr.sbin/ypserv/revnetgroup/Makefile
index 8ffb83c..f97787a 100644
--- usr.sbin/ypserv/revnetgroup/Makefile
+++ usr.sbin/ypserv/revnetgroup/Makefile
@@ -9,4 +9,5 @@ MAN= revnetgroup.8
 LDADD+=        -lutil
 DPADD+=        ${LIBUTIL}
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/stdethers/Makefile usr.sbin/ypserv/stdethers/Makefile
index 923dfa8..ee97888 100644
--- usr.sbin/ypserv/stdethers/Makefile
+++ usr.sbin/ypserv/stdethers/Makefile
@@ -4,4 +4,5 @@ PROG=   stdethers
 MAN=   stdethers.8
 CFLAGS+= -DNTOA_FIX
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/stdhosts/Makefile usr.sbin/ypserv/stdhosts/Makefile
index e2c6a36..3f5dadb 100644
--- usr.sbin/ypserv/stdhosts/Makefile
+++ usr.sbin/ypserv/stdhosts/Makefile
@@ -3,4 +3,5 @@
 PROG=  stdhosts
 MAN=   stdhosts.8
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/yppush/Makefile usr.sbin/ypserv/yppush/Makefile
index 57f0fef..58d7016 100644
--- usr.sbin/ypserv/yppush/Makefile
+++ usr.sbin/ypserv/yppush/Makefile
@@ -8,4 +8,5 @@ DPADD=  ${LIBRPCSVC}
 .PATH: ${.CURDIR}/../common ${.CURDIR}/../ypserv
 CFLAGS+=-I${.CURDIR}/../common
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/ypserv/Makefile usr.sbin/ypserv/ypserv/Makefile
index 5952679..b658758 100644
--- usr.sbin/ypserv/ypserv/Makefile
+++ usr.sbin/ypserv/ypserv/Makefile
@@ -29,4 +29,5 @@ ypv1.c: ypv1.x
 ypv1.h: ypv1.x
        rpcgen -C -h ${.CURDIR}/ypv1.x -o ypv1.h
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/yptest/Makefile usr.sbin/ypserv/yptest/Makefile
index f0d197a..3f17222 100644
--- usr.sbin/ypserv/yptest/Makefile
+++ usr.sbin/ypserv/yptest/Makefile
@@ -3,4 +3,5 @@
 PROG=  yptest
 MAN=   yptest.8
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git usr.sbin/ypserv/ypxfr/Makefile usr.sbin/ypserv/ypxfr/Makefile
index 11ac195..975eebd 100644
--- usr.sbin/ypserv/ypxfr/Makefile
+++ usr.sbin/ypserv/ypxfr/Makefile
@@ -19,4 +19,5 @@ beforeinstall:
            ${.CURDIR}/${script} ${DESTDIR}${BINDIR}/${script:R}
 .endfor
 
+.include "../../Makefile.inc"
 .include <bsd.prog.mk>


-- 
I'm not entirely sure you are real.

Reply via email to