diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1999-07-20 23:42:31 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1999-07-20 23:42:31 +0000 |
| commit | b1b67f1bd946e2720e0f97a212a94dded125c88b (patch) | |
| tree | 8e22b17209707af7ff88b9fa04ca373fa27762f5 /x11-servers | |
| parent | Don't ask questions if we are doing the parallel build, as it won't (diff) | |
Use ${OSVERSION} instead of uname.
Notes
Notes:
svn path=/head/; revision=20288
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 3 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 2 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 3 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 4c60a7b7d234..794220f3be48 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -3,7 +3,7 @@ # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $ +# $Id: Makefile,v 1.55 1999/07/20 22:14:55 jmz Exp $ # DISTNAME= xc @@ -25,6 +25,7 @@ ALL_TARGET= World INSTALL_TARGET= install install.man DIST_SUBDIR= xc PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet +SCRIPTS_ENV= OSVERSION=${OSVERSION} # can't use USE_X_PREFIX here -- it will cause a circular dependency PREFIX= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11.dist diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 7a2771866ab1..7b0dd6664444 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -227,7 +227,7 @@ else ELF=no fi -if [ ! `uname -r|grep ^2` ]; then +if [ ${OSVERSION} -ge 300000 ]; then cat <<'END' FreeBSD-3.x has support for Secure RPC. diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 4c60a7b7d234..794220f3be48 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -3,7 +3,7 @@ # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $ +# $Id: Makefile,v 1.55 1999/07/20 22:14:55 jmz Exp $ # DISTNAME= xc @@ -25,6 +25,7 @@ ALL_TARGET= World INSTALL_TARGET= install install.man DIST_SUBDIR= xc PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet +SCRIPTS_ENV= OSVERSION=${OSVERSION} # can't use USE_X_PREFIX here -- it will cause a circular dependency PREFIX= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11.dist diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 7a2771866ab1..7b0dd6664444 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -227,7 +227,7 @@ else ELF=no fi -if [ ! `uname -r|grep ^2` ]; then +if [ ${OSVERSION} -ge 300000 ]; then cat <<'END' FreeBSD-3.x has support for Secure RPC. |