[src/trunk]: src/share/mk fix up X11FLAGS.LOADABLE for modern xorg.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/59ce21059083
branches:  trunk
changeset: 347276:59ce21059083
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 20 00:35:37 2016 +0000

description:
fix up X11FLAGS.LOADABLE for modern xorg.

diffstat:

 share/mk/bsd.x11.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 879d0ff630f6 -r 59ce21059083 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sat Aug 20 00:34:42 2016 +0000
+++ b/share/mk/bsd.x11.mk       Sat Aug 20 00:35:37 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.120 2016/08/16 01:03:07 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.121 2016/08/20 00:35:37 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -114,8 +114,10 @@
     ${MACHINE} == "shark"      || \
     ${MACHINE} == "zaurus"
 #      LOADABLE
-X11FLAGS.LOADABLE=     -DXFree86LOADER -DIN_MODULE -DXFree86Module \
-                       ${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
+.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
+X11FLAGS.LOADABLE=     -DXFree86LOADER
+.endif
+X11FLAGS.LOADABLE+=    ${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
 .endif
 
 # XXX FIX ME