Page MenuHomeFreeBSD
Files F162625276

D42947.id131108.diff
No OneTemporary
Actions

D42947.id131108.diff
View Options

diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -1,9 +1,9 @@
-OSNAME?= FreeBSD
SUBDIR= distextract distfetch partedit runconsoles scripts
SUBDIR_PARALLEL=
-SUBDIR_DEPEND_distfetch = distextract
-SUBDIR_DEPEND_partedit = distextract
+SUBDIR_DEPEND_distextract = osname
+SUBDIR_DEPEND_distfetch = osname
+SUBDIR_DEPEND_partedit = osname
SCRIPTS= bsdinstall
MAN= bsdinstall.8
PACKAGE= bsdinstall
@@ -11,5 +11,6 @@
SCRIPTS+= startbsdinstall
SCRIPTSDIR_startbsdinstall= ${LIBEXECDIR}/bsdinstall
+UPDATE_DEPENDFILE= no
.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/Makefile.depend
--- a/usr.sbin/bsdinstall/Makefile.depend
+++ b/usr.sbin/bsdinstall/Makefile.depend
@@ -1,10 +1,12 @@
-# Autogenerated - do NOT edit!
+# Not autogenerated - take care
DIRDEPS = \
+ usr.sbin/bsdinstall/distextract \
+ usr.sbin/bsdinstall/distfetch \
+ usr.sbin/bsdinstall/include \
+ usr.sbin/bsdinstall/partedit \
+ usr.sbin/bsdinstall/runconsoles \
+ usr.sbin/bsdinstall/scripts \
.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.sbin/bsdinstall/Makefile.inc b/usr.sbin/bsdinstall/Makefile.inc
--- a/usr.sbin/bsdinstall/Makefile.inc
+++ b/usr.sbin/bsdinstall/Makefile.inc
@@ -1 +1,4 @@
PACKAGE=bsdinstall
+
+CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../include
+
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -1,18 +1,9 @@
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distextract
-CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I.
LIBADD= archive bsddialog m
SRCS= distextract.c
MAN=
-GENHDRS= opt_osname.h
-SRCS+= ${GENHDRS}
-CLEANFILES+= ${GENHDRS}
-
-opt_osname.h: .PHONY
- if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \
- echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \
- fi
.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend
--- a/usr.sbin/bsdinstall/distextract/Makefile.depend
+++ b/usr.sbin/bsdinstall/distextract/Makefile.depend
@@ -9,6 +9,7 @@
lib/libc \
lib/libcompiler_rt \
lib/msun \
+ usr.sbin/bsdinstall/include \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -1,7 +1,6 @@
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distfetch
-CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract
LIBADD= fetch bsddialog
MAN=
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend
--- a/usr.sbin/bsdinstall/distfetch/Makefile.depend
+++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend
@@ -8,7 +8,7 @@
lib/libc \
lib/libcompiler_rt \
lib/libfetch \
- usr.sbin/bsdinstall/distextract \
+ usr.sbin/bsdinstall/include \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/include/Makefile b/usr.sbin/bsdinstall/include/Makefile
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdinstall/include/Makefile
@@ -0,0 +1,13 @@
+OSNAME?= FreeBSD
+GENHDRS= opt_osname.h
+SRCS+= ${GENHDRS}
+CLEANFILES+= ${GENHDRS}
+
+opt_osname.h: ${META_NOPHONY}
+ @if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET} 2> /dev/null; then \
+ echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \
+ fi
+
+MK_STAGING= no
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/include/Makefile.depend
copy from usr.sbin/bsdinstall/Makefile.depend
copy to usr.sbin/bsdinstall/include/Makefile.depend
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -4,7 +4,6 @@
LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
${BINDIR}/partedit ${BINDIR}/scriptedpart
SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade
-CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract
LIBADD+= geom util bsddialog
PARTEDIT_ARCH= ${MACHINE}
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -9,7 +9,7 @@
lib/libcompiler_rt \
lib/libgeom \
lib/libutil \
- usr.sbin/bsdinstall/distextract \
+ usr.sbin/bsdinstall/include \
.include <dirdeps.mk>

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 16, 5:29 AM (16 h, 7 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35125121
Default Alt Text
D42947.id131108.diff (4 KB)

Event Timeline