From ff3fbe39fbff2cecb575bfa5ab02426de8812dd3 Mon Sep 17 00:00:00 2001
From: bustico
Date: Thu, 17 Feb 2011 09:49:22 +0000
Subject: fix debian squeeze compilation

---
 Ivycpp.h | 2 +-
 Makefile | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Ivycpp.h b/Ivycpp.h
index 55a429d..86e1075 100644
--- a/Ivycpp.h
+++ b/Ivycpp.h
@@ -17,7 +17,7 @@
 namespace IvyC
 {
 #ifdef USE_XT
- #include "ivyxtloop.h"
+ #include <Ivy/ivyxtloop.h>
 #else
  #include <Ivy/ivyloop.h>
 #endif
diff --git a/Makefile b/Makefile
index 644f0f4..cb2b3c0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 # $Id$
 
 os=$(shell uname -s)
+PATH := $(PATH):/usr/lib/qt4/bin/:/usr/share/qt4/bin/
 
 ifeq ($(os),Darwin)
     IVY_PATH := $(HOME)/src-ext/ivy-c-3.6/src
@@ -14,7 +15,7 @@ else
     LIB:= lib$(PERHAPS64)
     XTLIB= -L/usr/$(LIB) -L/usr/X11R6/$(LIB)
     XTOPT= -DUSE_XT
-    QTINC= -I/usr/lib/qt4/include -I/usr/lib/qt4/include/QtCore -I/usr/lib/qt4/include/QtGui
+    QTINC=  -I/usr/include/qt4 -I/usr/lib/qt4/include -I/usr/lib/qt4/include/QtCore -I/usr/lib/qt4/include/QtGui
     QTOPT= -D_REENTRANT -DQT_SHARED
     QTLIB= -lQtGui -lQtCore -lpthread
 
@@ -110,7 +111,7 @@ Ivy_Xt.o: Ivy.cxx
 ivyqtloop.o: ivyqtloop.moc
 
 ivyqtloop.moc: ivyqtloop.h
-	/usr/lib/qt4/bin/moc $(QTOPT) $(QTINC) -i $< -o $@
+	moc $(QTOPT) $(QTINC) -i $< -o $@
 
 ivyqtloop.o: ivyqtloop.cxx
 	$(CC) $(QTINC) $(QTOPT) -c $<
@@ -168,7 +169,7 @@ testIvyXt : testIvyXt.cxx
 	g++  -g  $(CPPFLAGS) $(XTLIB) $(LLDLIBS)  -o $@  testIvyXt.cxx  -lIvy -lxtivy -lXt -lX11 -lIvy_Xt
 
 testIvyQt.moc: testIvyQt.cxx
-	/usr/lib/qt4/bin/moc $(QTOPT) $(QTINC) -i $< -o $@
+	moc $(QTOPT) $(QTINC) -i $< -o $@
 
 testIvyQt : testIvyQt.cxx testIvyQt.moc
 	g++  -g  $(QTOPT) $(QTINC) $(QTLIB) $(LLDLIBS)  -o $@  testIvyQt.cxx -lIvy_Qt -livy
@@ -177,7 +178,7 @@ testIvyQt : testIvyQt.cxx testIvyQt.moc
 distclean clean : 
 	rm -f $(LIBIVY_STATIC) $(LIBIVY_GLFW_STATIC) $(LIBIVY_SHARED) \
 		$(LIBIVY_GLFW_SHARED) $(OBJECTS) $(DEPS) \
-		$(OBJECTS_GLFW) $(DEPS_GLFW) core *.o *.d *~
+		$(OBJECTS_GLFW) $(DEPS_GLFW) core *.o *.d *~ *.moc
 
 -include *.d
 
-- 
cgit v1.1