diff options
| -rw-r--r-- | etc/defaults/make.conf | 1 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 1 | ||||
| -rw-r--r-- | usr.bin/doscmd/Makefile | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 3a6e588..0ae86e3 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -36,6 +36,7 @@ #NO_OPENSSH= true # do not build OpenSSH #NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) #NO_SENDMAIL= true # do not build sendmail and related programs +#NO_X= true # do not compile in XWindows support (e.g. doscmd) #NOCRYPT= true # do not build any crypto code #NODESCRYPTLINKS=true # do not replace libcrypt -> libscrypt links #NOGAMES= true # do not build games (games/ subdir) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 3a6e588..0ae86e3 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -36,6 +36,7 @@ #NO_OPENSSH= true # do not build OpenSSH #NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) #NO_SENDMAIL= true # do not build sendmail and related programs +#NO_X= true # do not compile in XWindows support (e.g. doscmd) #NOCRYPT= true # do not build any crypto code #NODESCRYPTLINKS=true # do not replace libcrypt -> libscrypt links #NOGAMES= true # do not build games (games/ subdir) diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile index 24256df..8ecdcec 100644 --- a/usr.bin/doscmd/Makefile +++ b/usr.bin/doscmd/Makefile @@ -26,8 +26,8 @@ EXEGRP= bin #BINMODE= 2555 EXEMODE= 444 -.if !defined(DESTDIR) && exists(${X11BASE}/include/X11/X.h) && \ - exists(${XLIBDIR}/libX11.a) +.if !defined(NO_X) && !defined(DESTDIR) && exists(${X11BASE}/include/X11/X.h) \ + && exists(${XLIBDIR}/libX11.a) CFLAGS+= -I${X11BASE}/include LDADD+= -L${XLIBDIR} -lX11 DPADD+= ${XLIBDIR}/libX11.a |
