diff options
| author | ru <ru@FreeBSD.org> | 2002-11-13 13:49:29 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-11-13 13:49:29 +0000 |
| commit | 7920e22cea169d5aaff2a66cc1383ec4f6e63e12 (patch) | |
| tree | d4d4eae9350b90f65572d961ca980edfb1f019f1 /usr.bin | |
| parent | 79449bdb2e785854f38c01098931c80cd996ee65 (diff) | |
| download | FreeBSD-src-7920e22cea169d5aaff2a66cc1383ec4f6e63e12.zip FreeBSD-src-7920e22cea169d5aaff2a66cc1383ec4f6e63e12.tar.gz | |
Take __FreeBSD_version into account when BOOTSTRAPPING.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/xargs/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/xargs/xargs.c | 12 | ||||
| -rw-r--r-- | usr.bin/xinstall/Makefile | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile index 1f258ca..1f33228 100644 --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -5,8 +5,4 @@ PROG= xargs SRCS= xargs.c strnsubst.c WARNS?= 4 -.if defined(BOOTSTRAPPING) -CFLAGS+=-DBOOTSTRAPPING -.endif - .include <bsd.prog.mk> diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 96ad3b4..5414e65 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -51,12 +51,13 @@ static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <sys/param.h> #include <sys/wait.h> #include <err.h> #include <errno.h> -#ifndef BOOTSTRAPPING +#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500017 #include <langinfo.h> #endif #include <locale.h> @@ -542,10 +543,11 @@ prompt(void) (void)fflush(stderr); if ((response = fgetln(ttyfp, &rsize)) == NULL || regcomp(&cre, -#ifdef BOOTSTRAPPING - "^[yY]", -#else +#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500017 nl_langinfo(YESEXPR), +#else + "^[yY]", #endif REG_BASIC) != 0) { (void)fclose(ttyfp); diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index e0886ed..2ed1eea 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -6,7 +6,9 @@ PROGNAME= install SRCS= xinstall.c MAN= install.1 -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 400021 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500007 )) .PATH: ${.CURDIR}/../../lib/libc/gen SRCS+= strtofflags.c .endif |
