diff options
| author | anholt <anholt@FreeBSD.org> | 2004-05-31 10:56:22 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-05-31 10:56:22 +0800 |
| commit | 55ef48f3c71c8b0d5431206bc8c09bea2dfae6c7 (patch) | |
| tree | f37b6ed7cc276d3f3e8d5a98da1a6d75131c5689 /x11-servers/xorg-server/Makefile.inc | |
| parent | 1afdfbfb90826c53abd808c143237afbb727a389 (diff) | |
| download | freebsd-ports-gnome-55ef48f3c71c8b0d5431206bc8c09bea2dfae6c7.tar.gz freebsd-ports-gnome-55ef48f3c71c8b0d5431206bc8c09bea2dfae6c7.tar.zst freebsd-ports-gnome-55ef48f3c71c8b0d5431206bc8c09bea2dfae6c7.zip | |
- Only set XFREE86_HTML_MAN if there are going to be manpages installed
(XMAN_DIRS is set).
- Remove spammed-in configure.gen.pre
- Pass thread flags/libs to configure like should have been done
- Add changes to config/cf/* for the fonts ports.
Diffstat (limited to 'x11-servers/xorg-server/Makefile.inc')
| -rw-r--r-- | x11-servers/xorg-server/Makefile.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 6c5af3b29c06..a2a51d9857a0 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -18,10 +18,16 @@ USE_X_PREFIX?= no PREFIX?= ${X11BASE} USE_IMAKE= YES +.if defined(XMAN_DIRS) XFREE86_HTML_MAN?= yes +.else +XFREE86_HTML_MAN?= no +.endif SCRIPTS_ENV+= CC="${CC}" \ CXX="${CXX}" \ CFLAGS="${CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + PTHREAD_CFLAGS="${PTHREAD_CLFAGS}" XINSTALL_DIRS?= ${XBUILD_DIRS} _XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} @@ -30,6 +36,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl .if !target(do-configure) |