From e1973a699493d99e3577cfdb62beeb3fd389cdd9 Mon Sep 17 00:00:00 2001
From: Kevin Layer <layer@franz.com>
Date: Wed, 10 Jul 2013 10:40:41 -0700
Subject: [PATCH] Fix include/lib path for Linux.

/usr/X11R6/ isn't used anymore, so update to use /usr/include and
/usr/lib.

Change-Id: I8bfb949b185354b06db299a920428dd35cff0572
---
 Makefile.amd64 | 10 ++++++++--
 Makefile.linux | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Makefile.amd64 b/Makefile.amd64
index 2df3f576..88ab52de 100644
--- a/Makefile.amd64
+++ b/Makefile.amd64
@@ -8,8 +8,14 @@ XINCLUDES = -I/usr/include/openmotif
 XLIBDIR  = /usr/lib64/openmotif
 endif
 
-XINCLUDES ?= /usr/X11R6/include
-XLIBDIR  ?= /usr/X11R6/lib64
+# This is the old location, but include it here, just in case 
+ifeq ($(shell if test -d /usr/X11R6/include; then echo yes; fi),yes)
+XINCLUDES = -I/usr/X11R6/include
+XLIBDIR   = /usr/X11R6/lib
+endif
+
+XINCLUDES ?= /usr/include
+XLIBDIR  ?= /usr/lib64
 
 TKLIB=-lXm -lXpm -lXext -lXp
 XTLIB=-lXt
diff --git a/Makefile.linux b/Makefile.linux
index dc28dd11..92941ff3 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -8,8 +8,14 @@ XINCLUDES = -I/usr/include/openmotif
 XLIBDIR   = /usr/lib/openmotif
 endif
 
-XINCLUDES ?= /usr/X11R6/include
-XLIBDIR   ?= /usr/X11R6/lib
+# This is the old location, but include it here, just in case 
+ifeq ($(shell if test -d /usr/X11R6/include; then echo yes; fi),yes)
+XINCLUDES = -I/usr/X11R6/include
+XLIBDIR   = /usr/X11R6/lib
+endif
+
+XINCLUDES ?= /usr/include
+XLIBDIR   ?= /usr/lib
 
 TKLIB=-lXm -lXpm -lXext -lXp
 XTLIB=-lXt
-- 
GitLab