From 161e6fa23ed54494b4dc969d3da2e9f432d7ac43 Mon Sep 17 00:00:00 2001
From: Alex Lin <alexander.s.lin@nasa.gov>
Date: Fri, 2 Oct 2015 08:41:47 -0500
Subject: [PATCH] Save X11 include and library information from configure

Temporary hardcoded patch to get data products to build under
El Capitan.

refs #133
---
 trick_source/data_products/DPX/APPS/FXPLOT/makefile | 2 +-
 trick_source/data_products/DPX/APPS/GXPLOT/makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
index 9875be5a..90e68f96 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/makefile
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
@@ -22,7 +22,7 @@ endif
 
 ifeq ($(TRICK_HOST_TYPE), Darwin)
      INCDIRS += -I/usr/X11/include
-     XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib -lXt -lX11 -lc++abi
+     XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11 -lc++abi
 else
      ifneq (${MOTIF_HOME},/usr)
          XLIBS = -L${MOTIF_HOME}/lib64 -L${MOTIF_HOME}/lib
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/makefile b/trick_source/data_products/DPX/APPS/GXPLOT/makefile
index 0165e863..ca3e4c71 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/makefile
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/makefile
@@ -23,7 +23,7 @@ endif
 ifeq ($(TRICK_HOST_TYPE), Darwin)
      INCDIRS += -I/usr/X11/include
      MOTIF_INCDIR = -I/sw/include
-     XLIBS = -L/usr/X11R6/lib -lXt -lX11 ${LIBXML} -lc++abi
+     XLIBS = -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11 ${LIBXML} -lc++abi
 else
      XLIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lXt -lX11 ${LIBXML}
 endif