summaryrefslogtreecommitdiffstats
path: root/usr.bin/doscmd
diff options
context:
space:
mode:
authorluoqi <luoqi@FreeBSD.org>1999-02-16 14:57:58 +0000
committerluoqi <luoqi@FreeBSD.org>1999-02-16 14:57:58 +0000
commit8074f143de2dfd0ff321bae3d860c2bdcfd336f3 (patch)
treeb11f2645f046d47878eff252e058e1144d46b6a2 /usr.bin/doscmd
parent8b1e97ea4e4d51628ec6eb04da086ea74f3eb261 (diff)
downloadFreeBSD-src-8074f143de2dfd0ff321bae3d860c2bdcfd336f3.zip
FreeBSD-src-8074f143de2dfd0ff321bae3d860c2bdcfd336f3.tar.gz
Look for aout X libraries at the right place.
Diffstat (limited to 'usr.bin/doscmd')
-rw-r--r--usr.bin/doscmd/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index 5fb64e1..218d7d0 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -1,6 +1,6 @@
# from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp
#
-# $Id: Makefile,v 1.14 1999/01/22 12:45:27 jdp Exp $
+# $Id: Makefile,v 1.15 1999/02/15 12:36:21 bde Exp $
PROG= doscmd
SRCS= AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
@@ -20,10 +20,16 @@ EXEGRP= bin
BINMODE=2555
EXEMODE=444
-.if exists(${X11BASE}/include) && exists(${X11BASE}/lib/libX11.a)
+.if ${OBJFORMAT} == "aout"
+XLIBDIR:= ${X11BASE}/lib/aout
+.else
+XLIBDIR:= ${X11BASE}/lib
+.endif
+
+.if exists(${X11BASE}/include) && exists(${XLIBDIR}/libX11.a)
CFLAGS+= -I. -I${X11BASE}/include -DDISASSEMBLER
-LDADD= -L${X11BASE}/lib -lX11
-DPADD= ${X11BASE}/lib/libX11.a
+LDADD= -L${XLIBDIR} -lX11
+DPADD= ${XLIBDIR}/libX11.a
.else
CFLAGS+= -I. -DDISASSEMBLER -DNO_X
.endif
OpenPOWER on IntegriCloud