From 7c0fe756b3cae52731d20e5f76d157a37a833792 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 11 Feb 2018 20:53:08 -0700
Subject: [PATCH] Revert to QT3 header files

---
 tools/Display/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/Display/Makefile b/tools/Display/Makefile
index 2e43f57..c1bb2b6 100644
--- a/tools/Display/Makefile
+++ b/tools/Display/Makefile
@@ -15,17 +15,15 @@ CXX	=	g++
 CFLAGS	=	-pipe -Wno-deprecated -O2 -DNO_DEBUG
 # CXXFLAGS=	-g -pipe -Wno-deprecated -Wall -W -O2 -std=c++98
 CXXFLAGS=	-pipe -Wno-deprecated -O2 -DNO_DEBUG -std=c++98
-QTINCDIR=-I/usr/include/qt4 -I/usr/include/qt4/Qt
 
-QTLIBDIR=/usr/lib/qt4
 SNARK14ROOT = ../..
 SNARK14LIB = $(SNARK14ROOT)/lib
 SNARK14INC = $(SNARK14ROOT)/include
 
-XERCES = /usr/local/snark14
+XERCES = ../..
 XERCESLIBDIR= $(XERCES)/lib
 XERCESLIB = xerces-c
-XERCESINCLUDE = $(XERCES)/include/xercesc
+XERCESINCLUDE = $(XERCES)/include
 
 DIGLIBDIR = $(SNARK14LIB)
 
@@ -35,10 +33,10 @@ DIGFILEINCLUDE = $(SNARK14INC)/DIGFile
 DIGFILESNARKLIB = DIGFileSnark
 DIGFILESNARKINCLUDE = $(SNARK14INC)/DIGFileSnark
 
-INCPATH	=	$(QTINCDIR) -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE) -I../../include
+INCPATH	=	-I$(QTDIR)/include -I$(XERCESINCLUDE) -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE)
 LINK	=	$(CXX) -std=c++98
 LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTLIBDIR) -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
+LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
 MOC	=	$(QTDIR)/bin/moc
 UIC	=	$(QTDIR)/bin/uic
 TAR	=	tar -cf
-- 
2.34.1