X-Git-Url: http://git.kpe.io/?p=snark14.git;a=blobdiff_plain;f=tools%2FDisplay%2FMakefile;h=2e43f570be5808ea5102b68312a6d5a3bb388dc4;hp=6195ed79864c4dce5e1e3e28012673f9ae8d6538;hb=008ec13cd73c8e9e7d1a596c24b85a8e5ed3f126;hpb=e08781393afc0bd73e7335a36003b39ccc11122f

diff --git a/tools/Display/Makefile b/tools/Display/Makefile
old mode 100755
new mode 100644
index 6195ed7..2e43f57
--- a/tools/Display/Makefile
+++ b/tools/Display/Makefile
@@ -15,7 +15,9 @@ 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
@@ -33,10 +35,10 @@ DIGFILEINCLUDE = $(SNARK14INC)/DIGFile
 DIGFILESNARKLIB = DIGFileSnark
 DIGFILESNARKINCLUDE = $(SNARK14INC)/DIGFileSnark
 
-INCPATH	=	-I$(QTDIR)/include -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE)
+INCPATH	=	$(QTINCDIR) -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE) -I../../include
 LINK	=	$(CXX) -std=c++98
 LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
+LIBS	=	$(SUBLIBS) -L$(QTLIBDIR) -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