--- Makefile.orig	2004-05-01 22:37:34.000000000 +0200
+++ Makefile	2004-05-01 22:41:14.000000000 +0200
@@ -12,11 +12,9 @@
 CXX      = g++
 LEX      = flex
 YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
 LEXFLAGS = 
 YACCFLAGS= -d
-INCPATH  = -I$(QTDIR)/mkspecs/default -I. -I$(QTDIR)/include
+INCPATH  = -I$(QTDIR)/mkspecs/linux-g++ -I. -I$(QTDIR)/include
 LINK     = g++
 LFLAGS   = 
 LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
@@ -115,10 +113,7 @@
 
 mocables: $(SRCMOC)
 
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-Makefile: qtvba.pro  $(QTDIR)/mkspecs/default/qmake.conf 
+Makefile: qtvba.pro  $(QTDIR)/mkspecs/linux-g++/qmake.conf 
 	$(QMAKE) -o Makefile qtvba.pro
 qmake: 
 	@$(QMAKE) -o Makefile qtvba.pro
@@ -233,10 +228,10 @@
 ####### Install
 
 install_target: 
-	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
-	$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-	-$(COPY) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-	-strip "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+	@$(CHK_DIR_EXISTS) $(DESTDIR)/$(prefix)/bin/ || $(MKDIR) $(DESTDIR)/$(prefix)/bin/
+	$(DEL_FILE) "$(DESTDIR)/$(prefix)/bin/$(QMAKE_TARGET)"
+	-$(COPY) "$(QMAKE_TARGET)" "$(DESTDIR)/$(prefix)/bin/$(QMAKE_TARGET)"
+	-strip "$(DESTDIR)/$(prefix)/bin/$(QMAKE_TARGET)"
 
 uninstall_target: 
 	-$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"