diff options
| author | marcel <marcel@FreeBSD.org> | 2000-01-05 12:59:31 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2000-01-05 12:59:31 +0000 |
| commit | 9d4189be2d61718f68aaa377a564d4fd17ced01e (patch) | |
| tree | 91be1e6e414c4082fce16728fdba9b2c4f3b4b7d /usr.bin/doscmd | |
| parent | 19a55adf4bef843d46c7e47876bc863711d4ffb7 (diff) | |
| download | FreeBSD-src-9d4189be2d61718f68aaa377a564d4fd17ced01e.zip FreeBSD-src-9d4189be2d61718f68aaa377a564d4fd17ced01e.tar.gz | |
Don't build with X support if DESTDIR is defined. This prevents
breaking a cross-build caused by taking the X libraries on the
build machine. In general this means that we never compile with
X support. The user has to manually compile doscmd for that.
Suggested by: bde, imp (among others)
Diffstat (limited to 'usr.bin/doscmd')
| -rw-r--r-- | usr.bin/doscmd/Makefile | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile index d620c8e..24256df 100644 --- a/usr.bin/doscmd/Makefile +++ b/usr.bin/doscmd/Makefile @@ -9,33 +9,30 @@ SRCS= AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \ mem.c mouse.c net.c port.c setver.c signal.c timer.c trace.c trap.c \ tty.c xms.c -.if ${OBJFORMAT} == "aout" -CLEANFILES= doscmd.kernel crt0.o doscmd_loader.o redir.com emsdriv.sys -.else -CLEANFILES= redir.com emsdriv.sys -.endif - -BINGRP= kmem -EXEGRP= bin -# BINMODE=2555 -EXEMODE=444 +CFLAGS+= -I. -DDISASSEMBLER +CLEANFILES= emsdriv.sys redir.com .if ${OBJFORMAT} == "aout" -XLIBDIR:= ${X11BASE}/lib/aout +CLEANFILES+= doscmd.kernel crt0.o doscmd_loader.o +XLIBDIR= ${X11BASE}/lib/aout +LDADD= -L${DESTDIR}${LIBDIR} -lgcc -lc +DPADD= ${LIBGCC} ${LIBC} .else -XLIBDIR:= ${X11BASE}/lib +XLIBDIR= ${X11BASE}/lib .endif -.if exists(${X11BASE}/include/X11/X.h) && exists(${XLIBDIR}/libX11.a) -CFLAGS+= -I. -I${X11BASE}/include -DDISASSEMBLER -LDADD= -L${XLIBDIR} -lX11 -DPADD= ${XLIBDIR}/libX11.a +BINGRP= kmem +EXEGRP= bin +#BINMODE= 2555 +EXEMODE= 444 + +.if !defined(DESTDIR) && exists(${X11BASE}/include/X11/X.h) && \ + exists(${XLIBDIR}/libX11.a) +CFLAGS+= -I${X11BASE}/include +LDADD+= -L${XLIBDIR} -lX11 +DPADD+= ${XLIBDIR}/libX11.a .else -CFLAGS+= -I. -DDISASSEMBLER -DNO_X -.endif -.if ${OBJFORMAT} == "aout" -LDADD+= -L${DESTDIR}${LIBDIR} -lgcc -lc -DPADD+= ${LIBGCC} ${LIBC} +CFLAGS+= -DNO_X .endif beforeinstall: |
