diff -ur mysql_navigator_0.7.0/Makefile mysql_navigator_0.7.0-patched/Makefile
--- mysql_navigator_0.7.0/Makefile	Thu Mar 22 09:40:27 2001
+++ mysql_navigator_0.7.0-patched/Makefile	Sat Mar 24 00:39:23 2001
@@ -7,6 +7,10 @@
 
 MAKEFILE=	Makefile
 TMAKE	=	tmake
+QTDIR=/usr/lib/qt-2.2.0
+MYSQL_INCLUDE=/usr/include/mysql
+MYSQL_LIB=/usr/lib/mysql
+PREFIX  =   /usr
 
 SUBDIRS	=	./src/mysqlnavigator \
 		./src/main
@@ -14,7 +18,8 @@
 all: $(SUBDIRS)
 
 $(SUBDIRS): FORCE
-	cd $@; $(MAKE)
+	cd $@;\
+    $(MAKE) QTDIR=$(QTDIR) MYSQL_INCLUDE=$(MYSQL_INCLUDE) MYSQL_LIB=$(MYSQL_LIB)
 
 tmake:
 	tmake build.pro
@@ -24,16 +29,17 @@
 
 clean:
 	for i in $(SUBDIRS); do ( cd $$i ; $(MAKE) clean ) ; done
+	rm -f lib/*
 
 install:
-	install -d /usr/local/share/mysql_navigator/po
-	install -s bin/mysql_navigator /usr/local/bin
-	cp -f ./po/* /usr/local/share/mysql_navigator/po
-	cp -df lib/libmysqlnavigator.* /usr/local/lib
+	install -d $(PREFIX)/share/mysql_navigator/po
+	install -s bin/mysql_navigator $(PREFIX)/bin
+	cp -f ./po/* $(PREFIX)/share/mysql_navigator/po
+	cp -df lib/libmysqlnavigator.* $(PREFIX)/lib
 
 deinstall:
-	rm -rf /usr/local/share/mysql_navigator
-	rm -rf /usr/local/bin/mysql_navigator
-	rm -rf /usr/local/lib/libmysqlnavigator.*
+	rm -rf $(PREFIX)/share/mysql_navigator
+	rm -rf $(PREFIX)/bin/mysql_navigator
+	rm -rf $(PREFIX)/lib/libmysqlnavigator.*
 
 FORCE:
diff -ur mysql_navigator_0.7.0/src/main/Makefile mysql_navigator_0.7.0-patched/src/main/Makefile
--- mysql_navigator_0.7.0/src/main/Makefile	Wed Mar 21 01:35:59 2001
+++ mysql_navigator_0.7.0-patched/src/main/Makefile	Sat Mar 24 00:39:23 2001
@@ -11,10 +11,10 @@
 CXX	=	g++
 CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
 CXXFLAGS=	-pipe -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-I../../include -I/usr/local/mysql/include/mysql -I$(QTDIR)/include
+INCPATH	=	-I../../include -I$(MYSQL_INCLUDE) -I$(QTDIR)/include
 LINK	=	g++
 LFLAGS	=	
-LIBS	=	-L$(QTDIR)/lib -L/usr/X11R6/lib -L../../lib -lmysqlnavigator -lqt -lXext -lX11 -lm
+LIBS	=	-L$(MYSQL_LIB) -L$(QTDIR)/lib -L/usr/X11R6/lib -L../../lib -lmysqlnavigator -lqt -lXext -lX11 -lm
 MOC	=	$(QTDIR)/bin/moc
 
 TAR	=	tar -cf
diff -ur mysql_navigator_0.7.0/src/mysqlnavigator/Makefile mysql_navigator_0.7.0-patched/src/mysqlnavigator/Makefile
--- mysql_navigator_0.7.0/src/mysqlnavigator/Makefile	Fri Mar 23 00:50:33 2001
+++ mysql_navigator_0.7.0-patched/src/mysqlnavigator/Makefile	Sat Mar 24 00:42:04 2001
@@ -11,10 +11,10 @@
 CXX	=	g++
 CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
 CXXFLAGS=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-I../../pics -I../../include -I/usr/local/mysql/include/mysql -I$(QTDIR)/include
+INCPATH	=	-I../../pics -I../../include -I$(MYSQL_INCLUDE) -I$(QTDIR)/include
 LINK	=	g++
 LFLAGS	=	-shared -Wl,-soname,libmysqlnavigator.so.1
-LIBS	=	-L$(QTDIR)/lib -L/usr/X11R6/lib -lmysqlclient -lqt -lXext -lX11 -lm
+LIBS	=	-L$(MYSQL_LIB) -L$(QTDIR)/lib -L/usr/X11R6/lib -lmysqlclient -lqt -lXext -lX11 -lm
 AR	=	ar cqs
 RANLIB	=	
 MOC	=	$(QTDIR)/bin/moc
Only in mysql_navigator_0.7.0-patched/src/mysqlnavigator: Makefile.rej
Only in mysql_navigator_0.7.0-patched/src/mysqlnavigator: Makefile~
diff -ur mysql_navigator_0.7.0/src/mysqlnavigator/user/user.cxx mysql_navigator_0.7.0-patched/src/mysqlnavigator/user/user.cxx
--- mysql_navigator_0.7.0/src/mysqlnavigator/user/user.cxx	Wed Mar 21 02:23:59 2001
+++ mysql_navigator_0.7.0-patched/src/mysqlnavigator/user/user.cxx	Sat Mar 24 00:39:23 2001
@@ -45,7 +45,9 @@
 
     tabWidget = new QTabWidget( this, "tabWidget" );
     tabWidget->setGeometry( QRect( 10, 10, 241, 385 - 60 ) );
-    tabWidget->setTabShape( QTabWidget::Rounded );
+    /* Rounded isn't a shape in 2.2.0, alas.
+       You get RoundedAbove or RoundedBelow. */
+    /*    tabWidget->setTabShape( QTabWidget::Rounded );*/
 
     QWidget* widget = new QWidget( tabWidget, "widget" );
     vbox = new QVBoxLayout( widget );
diff -ur mysql_navigator_0.7.0/src/mysqlnavigator/xport/xportexport.cxx mysql_navigator_0.7.0-patched/src/mysqlnavigator/xport/xportexport.cxx
--- mysql_navigator_0.7.0/src/mysqlnavigator/xport/xportexport.cxx	Fri Mar 23 08:55:30 2001
+++ mysql_navigator_0.7.0-patched/src/mysqlnavigator/xport/xportexport.cxx	Sat Mar 24 00:39:23 2001
@@ -144,7 +144,7 @@
 
 		while((field = mysql_fetch_field(result)))
 		{
-			if(IS_NUM_FIELD(field) == FALSE)
+                        if(IS_NUM(field->type))
 			{
 				if(row[l] == NULL)
 				{