Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:24:36 UTC 2014
Modified Files:
src/usr.bin/config: defs.h mkmakefile.c
Log Message:
FIT_NOPROLOGUE is never set anywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/config/defs.h
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/config/mkmakefile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.51 src/usr.bin/config/defs.h:1.52
--- src/usr.bin/config/defs.h:1.51 Thu Oct 9 19:20:56 2014
+++ src/usr.bin/config/defs.h Thu Oct 9 19:24:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.51 2014/10/09 19:20:56 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.52 2014/10/09 19:24:36 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -324,7 +324,6 @@ struct filetype
TAILQ_ENTRY(files) fit_anext; /* next file in attr */
};
/* Anything less than 0x10 is sub-type specific */
-#define FIT_NOPROLOGUE 0x10 /* Don't prepend $S/ */
#define FIT_FORCESELECT 0x20 /* Always include this file */
/*
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.22 src/usr.bin/config/mkmakefile.c:1.23
--- src/usr.bin/config/mkmakefile.c:1.22 Thu Oct 9 19:22:31 2014
+++ src/usr.bin/config/mkmakefile.c Thu Oct 9 19:24:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.22 2014/10/09 19:22:31 uebayasi Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.23 2014/10/09 19:24:36 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -269,7 +269,7 @@ srcpath(struct files *fi)
static const char *
filetype_prologue(struct filetype *fit)
{
- if (fit->fit_flags & FIT_NOPROLOGUE || *fit->fit_path == '/')
+ if (*fit->fit_path == '/')
return ("");
else
return ("$S/");