external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

OpenBSD 6+: use installed X11 and Motif

Browse source 
This commit removes the need to setup X11 and motif import symlinks
before building CDE.  With OpenBSD v6+, the installed versions of X11 and
Motif will be used.

This may work with earlier versions of OpenBSD as well, but I don't
have access to those older versions.  If you try it, and it works,
send a patch to the CDE mailing list.

This was tested on OpenBSD 6.2
This commit is contained in:
Jon Trulson 2018-06-14 12:59:21 -06:00
parent f598ed2358
commit 59b83865ef
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cde/config/cf/OpenBSD.cf
View file

@ -148,6 +148,11 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif # endif
#endif #endif
/* Use installed versions of Xm and X11 */
#if OSMajorVersion >= 6
# define UseInstalledX11 YES
#endif
/* /*
* Compiler Features * Compiler Features
*/ */

2
cde/config/imake/Makefile.ini
View file

@ -11,7 +11,7 @@
BOOTSTRAPCFLAGS = BOOTSTRAPCFLAGS =
CC = cc CC = cc
CDEBUGFLAGS = -O CDEBUGFLAGS = -O
INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I../../imports/x11/include/X11 INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I../../imports/x11/include/X11
CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
SHELL = /bin/sh SHELL = /bin/sh
RM = rm -f RM = rm -f