From af145348b2901ea6e6fa6c25a65092d71c420764 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Mon, 9 Jan 2006 20:54:58 +0000 Subject: [PATCH] Auto-detect X11 path from the following list: /usr/X11R6 (What MIT does by default) /usr/X11 (Usually a symlink to the current X11R*) /usr/X (Non-MIT implementations use this - eg: Solaris) /usr (Ubuntu 5.10 - <censored>) --- src/conio/Common.gmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake index fee90be74f..1cabce553a 100644 --- a/src/conio/Common.gmake +++ b/src/conio/Common.gmake @@ -46,6 +46,8 @@ ifdef WITH_SDL endif endif +X_PATH ?= $(shell if [ -f /usr/X11R6/include/X11/Xlib.h ]; then echo /usr/X11R6 ; elif [ -f /usr/X11/include/X11/Xlib.h ] ; then echo /usr/X11 ; elif [ -f /usr/X/include/X11/Xlib.h ] ; then echo /usr/X ; elif [ -f /usr/include/X11/Xlib.h ] ; then echo /usr ; else echo 0 ; fi) + ifeq ($(os),sunos) X_PATH ?= /usr/X else -- GitLab