- retire MKXORG from public use
- introduce X11FLAVOUR to choose src/x11 vs src/external/mit/xorg for the X11 to build if MKX11=yes is set. it takes the values of either Xorg or XFree86. - default to Xorg on alpha, i386, macppc, shark, sparc and sparc64 - remove MKXORG_WITH_XSRC_XSERVER, unused and never useful
This commit is contained in:
mrg
parent
1c06724455
commit
9c8df5ee67
17
BUILDING
17
BUILDING
|
|
@ -305,18 +305,9 @@ CONFIGURATION
|
|||
|
||||
Default: ``no''
|
||||
|
||||
MKX11 Can be set to ``yes'' or ``no''. Indicates whether X11R6 is
|
||||
MKX11 Can be set to ``yes'' or ``no''. Indicates whether X11 is
|
||||
built from X11SRCDIR.
|
||||
|
||||
Mutually exclusive to MKXORG != no.
|
||||
|
||||
Default: ``no''
|
||||
|
||||
MKXORG Can be set to ``yes'' or ``no''. Indicates whether X11R7
|
||||
(modular Xorg) is built from X11SRCDIR.
|
||||
|
||||
Mutually exclusive to MKX11 != no.
|
||||
|
||||
Default: ``no''
|
||||
|
||||
TOOLDIR Directory to hold the host tools, once built. If specified,
|
||||
|
|
@ -358,6 +349,12 @@ CONFIGURATION
|
|||
|
||||
Default: ``/usr/xsrc''
|
||||
|
||||
X11FLAVOUR The style of X11 cross-built, set to either ``Xorg'' or
|
||||
``XFree86''.
|
||||
|
||||
Default: ``Xorg'' on amd64, i386, macppc, shark, sparc and
|
||||
sparc64 platforms, ``XFree86'' on everything else.
|
||||
|
||||
"make" variables for full builds
|
||||
These variables only affect the top level ``Makefile'' and do not affect
|
||||
manually building subtrees of the NetBSD source code.
|
||||
|
|
|
|||
20
Makefile
20
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.262 2008/10/27 22:32:51 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.263 2008/11/09 23:02:28 mrg Exp $
|
||||
|
||||
#
|
||||
# This is the top-level makefile for building NetBSD. For an outline of
|
||||
|
|
@ -103,9 +103,9 @@
|
|||
# do-compat-lib-libc: builds and installs prerequisites from compat/lib/libc
|
||||
# if ${MKCOMPAT} != "no".
|
||||
# do-build: builds and installs the entire system.
|
||||
# do-x11: builds and installs X11; either
|
||||
# X11R7 from src/external/mit/xorg if ${MKXORG} != "no"
|
||||
# or X11R6 from src/x11 if ${MKX11} != "no"
|
||||
# do-x11: builds and installs X11 if ${MKX11} != "no"; either
|
||||
# X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
|
||||
# or X11R6 from src/x11
|
||||
# do-obsolete: installs the obsolete sets (for the postinstall-* targets).
|
||||
#
|
||||
|
||||
|
|
@ -242,7 +242,7 @@ BUILDTARGETS+= do-compat-lib-libc
|
|||
.endif
|
||||
BUILDTARGETS+= do-ld.so
|
||||
BUILDTARGETS+= do-build
|
||||
.if ${MKX11} != "no" || ${MKXORG} != "no"
|
||||
.if ${MKX11} != "no"
|
||||
BUILDTARGETS+= do-x11
|
||||
.endif
|
||||
BUILDTARGETS+= do-obsolete
|
||||
|
|
@ -458,12 +458,14 @@ do-build: .PHONY .MAKE
|
|||
.endfor
|
||||
|
||||
do-x11: .PHONY .MAKE
|
||||
.if ${MKXORG} != "no"
|
||||
.if ${MKX11} != "no"
|
||||
.if ${X11FLAVOUR} == "Xorg"
|
||||
${MAKEDIRTARGET} external/mit/xorg build
|
||||
.elif ${MKX11} != "no"
|
||||
${MAKEDIRTARGET} x11 build
|
||||
.else
|
||||
@echo "Neither MKX11 or MKXORG is enabled"
|
||||
${MAKEDIRTARGET} x11 build
|
||||
.endif
|
||||
.else
|
||||
@echo "MKX11 is not enabled"
|
||||
@false
|
||||
.endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.63 2008/10/25 22:23:55 apb Exp $
|
||||
# $NetBSD: Makefile,v 1.64 2008/11/09 23:02:29 mrg Exp $
|
||||
|
||||
# The `all' target must appear before bsd.own.mk is pulled in.
|
||||
all:
|
||||
|
|
@ -25,7 +25,7 @@ SETSCMD= cd ${.CURDIR} && \
|
|||
${HOST_SH}
|
||||
|
||||
MAKETARS_FLAGS=
|
||||
.if ${MKX11} != "no" || ${MKXORG} != "no"
|
||||
.if ${MKX11} != "no"
|
||||
MAKEFLIST_FLAGS= -b
|
||||
MAKESRCTARS_FLAGS= -x ${X11SRCDIR} -N ${NETBSDSRCDIR}/etc
|
||||
.else
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: sets.subr,v 1.71 2008/10/26 07:31:00 mrg Exp $
|
||||
# $NetBSD: sets.subr,v 1.72 2008/11/09 23:02:29 mrg Exp $
|
||||
#
|
||||
|
||||
#
|
||||
|
|
@ -171,6 +171,14 @@ MKMANPAGES=no
|
|||
.else
|
||||
MKMANPAGES=yes
|
||||
.endif
|
||||
.if \${MKX11} != "no"
|
||||
. if \${X11FLAVOUR} == "Xorg"
|
||||
MKXORG:=yes
|
||||
MKX11:=no
|
||||
. else
|
||||
MKXORG:=no
|
||||
. endif
|
||||
.endif
|
||||
all:
|
||||
.for i in MACHINE MACHINE_ARCH MACHINE_CPU \
|
||||
HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \
|
||||
|
|
@ -221,7 +229,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
|
|||
# In each file, a record consists of a path and a System Package name,
|
||||
# separated by whitespace. E.g.,
|
||||
#
|
||||
# # $NetBSD: sets.subr,v 1.71 2008/10/26 07:31:00 mrg Exp $
|
||||
# # $NetBSD: sets.subr,v 1.72 2008/11/09 23:02:29 mrg Exp $
|
||||
# . base-sys-root [keyword[,...]]
|
||||
# ./altroot base-sys-root
|
||||
# ./bin base-sys-root
|
||||
|
|
@ -280,8 +288,8 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
|
|||
# sendmail ${MKSENDMAIL} != no
|
||||
# share ${MKSHARE} != no
|
||||
# skey ${MKSKEY} != no
|
||||
# x11 ${MKX11} != no
|
||||
# xorg ${MKXORG} != no
|
||||
# x11 ${MKX11} != no && ${X11FLAVOUR} == "XFree86"
|
||||
# xorg ${MKX11} != no && ${X11FLAVOUR} == "XFree86"
|
||||
# yp ${MKYP} != no
|
||||
#
|
||||
# gcc=<n> <n> = value of ${HAVE_GCC}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: BUILDING.mdoc,v 1.67 2008/09/24 07:36:52 apb Exp $
|
||||
.\" $NetBSD: BUILDING.mdoc,v 1.68 2008/11/09 23:02:29 mrg Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -549,20 +549,8 @@ This also has implications on full builds (see next subsection).
|
|||
.
|
||||
.It Sy MKX11
|
||||
.YorN
|
||||
Indicates whether X11R6 is built from
|
||||
Indicates whether X11 is built from
|
||||
.Sy X11SRCDIR .
|
||||
.Pp
|
||||
Mutually exclusive to
|
||||
.Sy MKXORG != no .
|
||||
.DFLTn
|
||||
.
|
||||
.It Sy MKXORG
|
||||
.YorN
|
||||
Indicates whether X11R7 (modular Xorg) is built from
|
||||
.Sy X11SRCDIR .
|
||||
.Pp
|
||||
Mutually exclusive to
|
||||
.Sy MKX11 != no .
|
||||
.DFLTn
|
||||
.
|
||||
.It Sy TOOLDIR
|
||||
|
|
@ -636,6 +624,17 @@ The main X11R6 source is found in
|
|||
.DFLT
|
||||
.Dq /usr/xsrc
|
||||
.
|
||||
.It Sy X11FLAVOUR
|
||||
The style of X11 cross-built, set to either
|
||||
.Dq Xorg
|
||||
or
|
||||
.Dq XFree86 .
|
||||
.DFLT
|
||||
.Dq Xorg
|
||||
on amd64, i386, macppc, shark, sparc and sparc64 platforms,
|
||||
.Dq XFree86
|
||||
on everything else.
|
||||
.
|
||||
.El
|
||||
.
|
||||
.Ss \*qmake\*q variables for full builds
|
||||
|
|
|
|||
18
etc/Makefile
18
etc/Makefile
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.359 2008/10/19 22:05:20 apb Exp $
|
||||
# $NetBSD: Makefile,v 1.360 2008/11/09 23:02:28 mrg Exp $
|
||||
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
|
||||
|
||||
# Environment variables without default values:
|
||||
|
|
@ -158,11 +158,13 @@ distribution: .PHONY .MAKE check_DESTDIR distrib-dirs
|
|||
${MAKEDIRTARGET} ${NETBSDSRCDIR} install _DISTRIB=
|
||||
.endif # !INSTALL_DONE
|
||||
${MAKEDIRTARGET} . install-etc-files
|
||||
.if ${MKXORG} != "no"
|
||||
. if ${MKX11} != "no"
|
||||
. if ${X11FLAVOUR} == "Xorg"
|
||||
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/mit/xorg distribution
|
||||
.elif ${MKX11} != "no"
|
||||
. else
|
||||
${MAKEDIRTARGET} ${NETBSDSRCDIR}/x11 distribution
|
||||
.endif
|
||||
. endif
|
||||
. endif
|
||||
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets makesetfiles
|
||||
.endif # !DISTRIBUTION_DONE
|
||||
|
||||
|
|
@ -190,7 +192,7 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \
|
|||
MKMAN MKMANZ MKNLS MKNVI MKOBJ MKOBJDIRS \
|
||||
MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
|
||||
MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
|
||||
MKUNPRIVED MKUPDATE MKX11 MKXORG MKYP \
|
||||
MKUNPRIVED MKUPDATE MKX11 MKYP \
|
||||
NBUILDJOBS NETBSDSRCDIR \
|
||||
NOCLEANDIR NODISTRIBDIRS NOINCLUDES \
|
||||
OBJMACHINE \
|
||||
|
|
@ -198,7 +200,7 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \
|
|||
USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
|
||||
USE_PAM USE_SKEY USE_YP \
|
||||
USETOOLS USR_OBJMACHINE \
|
||||
X11SRCDIR
|
||||
X11SRCDIR X11FLAVOUR
|
||||
|
||||
params: .PHONY
|
||||
.for var in ${RELEASEVARS}
|
||||
|
|
@ -357,13 +359,13 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
|
|||
#
|
||||
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
|
||||
OBSOLETE.files= base comp etc games man misc tests text
|
||||
.if ${MKX11} != "no" || ${MKXORG} != "no"
|
||||
.if ${MKX11} != "no"
|
||||
OBSOLETE.files+= xbase xcomp xetc xfont xserver
|
||||
.endif
|
||||
|
||||
install-obsolete-lists: .PHONY .MAKE
|
||||
mkdir -p ${OBSOLETE.dir}
|
||||
.if ${MKX11} != "no" || ${MKXORG} != "no"
|
||||
.if ${MKX11} != "no"
|
||||
(cd ${NETBSDSRCDIR}/distrib/sets && \
|
||||
MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
|
||||
.else
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.4 2008/08/28 07:21:44 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2008/11/09 23:02:28 mrg Exp $
|
||||
|
||||
# Makefile for modular-xorg-server and drivers
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${MKXORG_WITH_XSRC_XSERVER} != "no"
|
||||
SUBDIR= ../../../../x11/Xserver
|
||||
.else
|
||||
SUBDIR= xorg-server drivers
|
||||
.endif
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: mk.conf.5,v 1.41 2008/09/10 11:16:41 joerg Exp $
|
||||
.\" $NetBSD: mk.conf.5,v 1.42 2008/11/09 23:02:29 mrg Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -679,23 +679,15 @@ This also has implications on full builds (see next subsection).
|
|||
.
|
||||
.It Sy MKX11
|
||||
.YorN
|
||||
Indicates whether X11R6 is built and installed
|
||||
Indicates whether X11 is built and installed
|
||||
(by descending into
|
||||
.Pa src/x11 ) .
|
||||
.Pa src/x11
|
||||
or
|
||||
.Pa src/external/mit/xorg
|
||||
depending on the value of
|
||||
.Sy X11FLAVOUR ) .
|
||||
.DFLTn
|
||||
.Pp
|
||||
This is mutually exclusive to
|
||||
.Sy MKXORG!=no .
|
||||
.
|
||||
.It Sy MKXORG
|
||||
.YorN
|
||||
Indicates whether X11R7 is built and installed
|
||||
(by descending into
|
||||
.Pa src/external/mit/xorg ) .
|
||||
.DFLTn
|
||||
.Pp
|
||||
This is mutually exclusive to
|
||||
.Sy MKX11!=no .
|
||||
.
|
||||
.It Sy MKYP
|
||||
.YorN
|
||||
|
|
@ -887,6 +879,22 @@ otherwise (to preserve traditional semantics of the
|
|||
.Xr make 1
|
||||
include files).
|
||||
.
|
||||
.It Sy X11FLAVOUR
|
||||
Picks which X11 distribution to cross-build with
|
||||
.Nx .
|
||||
Set to either
|
||||
.Dq Xorg
|
||||
or
|
||||
.Dq XFree86 .
|
||||
Only relevant if
|
||||
.Sy MKX11!=no .
|
||||
.Pp
|
||||
.Em Default :
|
||||
.Dq Xorg
|
||||
on alpha, i386, macppc, shark, sparc and sparc64 platforms.
|
||||
.Dq XFree86
|
||||
on everything else.
|
||||
.
|
||||
.El
|
||||
.
|
||||
.Ss pkgsrc system variables
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.README,v 1.236 2008/10/26 23:13:24 apb Exp $
|
||||
# $NetBSD: bsd.README,v 1.237 2008/11/09 23:02:29 mrg Exp $
|
||||
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
|
||||
|
||||
This is the README file for the make "include" files for the NetBSD
|
||||
|
|
@ -332,16 +332,10 @@ MKUPDATE If not "no", 'make install' only installs targets that are
|
|||
installed counterparts.
|
||||
Default: no
|
||||
|
||||
MKX11 If not "no", 'make build' also descends into src/x11
|
||||
to cross-build X11R6 and automatically enables creation
|
||||
of X sets.
|
||||
Mutually exclusive to MKXORG!=no
|
||||
Default: no
|
||||
|
||||
MKXORG If not "no", 'make build' also descends into
|
||||
src/external/mit/xorg to cross-build X11R7 (modular Xorg)
|
||||
and automatically enables creation of X sets.
|
||||
Mutually exclusive to MKX11!=no
|
||||
MKX11 If not "no", depending on the value of ${X11FLAVOUR},
|
||||
'make build' also descends into either src/x11 (XFree86) or
|
||||
src/external/mit/xorg (modular Xorg) to cross-build X11 and
|
||||
automatically enables creation of X sets.
|
||||
Default: no
|
||||
|
||||
MKYP If "no", disables building of YP (NIS)
|
||||
|
|
@ -391,6 +385,11 @@ USE_YP If "no", disables building YP (NIS) support into
|
|||
various system utilities/libraries that support it.
|
||||
If ${MKYP} is "no", USE_YP will also be forced to "no".
|
||||
|
||||
X11FLAVOUR Set to "Xorg" or "XFree86", depending on whether to build
|
||||
XFree86 or modular Xorg. Only matters if MKX11!=no.
|
||||
Default: "yes" on amd64, i386, macppc, shark, sparc and
|
||||
sparc64, "no" on everything else.
|
||||
|
||||
COPTS.lib<lib>
|
||||
OBJCOPTS.lib<lib>
|
||||
LDADD.lib<lib>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.own.mk,v 1.543 2008/11/06 22:13:58 macallan Exp $
|
||||
# $NetBSD: bsd.own.mk,v 1.544 2008/11/09 23:02:29 mrg Exp $
|
||||
|
||||
.if !defined(_BSD_OWN_MK_)
|
||||
_BSD_OWN_MK_=1
|
||||
|
|
@ -663,10 +663,21 @@ ${var}?= yes
|
|||
MKMANZ MKMODULAR MKOBJDIRS \
|
||||
MKPCC MKPCCCMDS \
|
||||
MKSOFTFLOAT MKSTRIPIDENT \
|
||||
MKUNPRIVED MKUPDATE MKX11 MKXORG
|
||||
MKUNPRIVED MKUPDATE MKX11
|
||||
${var}?=no
|
||||
.endfor
|
||||
|
||||
#
|
||||
# Do we default to XFree86 or Xorg for this platform?
|
||||
#
|
||||
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \
|
||||
${MACHINE} == "macppc" || ${MACHINE} == "shark" || \
|
||||
${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
|
||||
X11FLAVOUR?= Xorg
|
||||
.else
|
||||
X11FLAVOUR?= XFree86
|
||||
.endif
|
||||
|
||||
#
|
||||
# Force some options off if their dependencies are off.
|
||||
#
|
||||
|
|
@ -786,7 +797,7 @@ ${var}?= yes
|
|||
X11SRCDIR?= /usr/xsrc
|
||||
X11SRCDIR.xc?= ${X11SRCDIR}/xfree/xc
|
||||
X11SRCDIR.local?= ${X11SRCDIR}/local
|
||||
.if ${MKXORG} != "no"
|
||||
.if ${X11FLAVOUR} == "Xorg"
|
||||
X11ROOTDIR?= /usr/X11R7
|
||||
.else
|
||||
X11ROOTDIR?= /usr/X11R6
|
||||
|
|
@ -860,10 +871,7 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist
|
|||
X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
|
||||
.endfor
|
||||
|
||||
# Default to no old Xserver builds for now
|
||||
MKXORG_WITH_XSRC_XSERVER?= no
|
||||
|
||||
.if ${MKXORG} != no
|
||||
.if ${X11FLAVOUR} == "Xorg"
|
||||
X11DRI?= yes
|
||||
.endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,7 @@
|
|||
# $NetBSD: bsd.x11.mk,v 1.70 2008/10/25 22:27:36 apb Exp $
|
||||
# $NetBSD: bsd.x11.mk,v 1.71 2008/11/09 23:02:29 mrg Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
.if make(depend) || make(all) || make(dependall)
|
||||
.if (${MKX11} != "no" && ${MKXORG} != "no")
|
||||
.BEGIN:
|
||||
@echo
|
||||
@echo "ERROR: \$$MKX11 and \$$MKXORG are mutually exclusive."
|
||||
@echo
|
||||
@false
|
||||
.endif
|
||||
.endif
|
||||
|
||||
BINDIR= ${X11BINDIR}
|
||||
LIBDIR= ${X11USRLIBDIR}
|
||||
MANDIR= ${X11MANDIR}
|
||||
|
|
@ -37,7 +27,7 @@ X11FLAGS.CONNECTION+= -DIPv6
|
|||
.endif
|
||||
|
||||
# EXT_DEFINES
|
||||
.if ${MKXORG} != "no"
|
||||
.if ${X11FLAVOUR} == "Xorg"
|
||||
X11FLAGS.BASE_EXTENSION= -DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC \
|
||||
-DXRECORD -DMITSHM -DBIGREQS -DXF86VIDMODE \
|
||||
-DXF86MISC -DDPMSExtension -DEVI \
|
||||
|
|
@ -131,7 +121,7 @@ X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \
|
|||
.endif
|
||||
|
||||
# XXX FIX ME
|
||||
.if ${MKXORG} != "no"
|
||||
.if ${X11FLAVOUR} == "Xorg"
|
||||
XVENDORNAMESHORT= '"X.Org"'
|
||||
XVENDORNAME= '"The X.Org Foundation"'
|
||||
XORG_RELEASE= '"Release 1.4.2"'
|
||||
|
|
@ -355,7 +345,7 @@ _X11MANTRANSFORM= \
|
|||
${X11EXTRAMANTRANSFORMS}
|
||||
|
||||
# Note the escaping trick for _X11MANTRANSFORM using % to replace spaces
|
||||
.if ${MKXORG} == "no"
|
||||
.if ${X11FLAVOUR} != "Xorg"
|
||||
X11VERSION= "XFree86 4.5.0"
|
||||
X11MANCPP?= yes
|
||||
_X11MANTRANSFORM+= \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.inc,v 1.17 2008/10/27 08:27:04 hubertf Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.18 2008/11/09 23:02:28 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
|
|||
CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
|
||||
.endif
|
||||
|
||||
.if (${MKXORG} != "no")
|
||||
.if ${X11FLAVOUR} == "Xorg"
|
||||
CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
|
||||
.endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue