hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-09 16:01:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't build with X support if DESTDIR is defined. This prevents

Browse Source 
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)
This commit is contained in:
Marcel Moolenaar 2000-01-05 12:59:31 +00:00
parent f64ac1e326
commit d355b81dd4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55457
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
usr.bin/doscmd/Makefile
View File

@ -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: