--- configs/freebsd-g++-shared-debug.orig	Thu Jun 21 09:27:41 2001
+++ configs/freebsd-g++-shared-debug	Thu Jun 21 09:31:12 2001
@@ -6,7 +6,7 @@
 
 # Compiling with support libraries
 SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
 SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
 
 # Compiling YACC output
@@ -23,7 +23,7 @@
 SYSCONF_LIBS_X11	= -lXext -lX11 -lm
 # Qt, Qt+OpenGL
 SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
-SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
 SYSCONF_LIBS_QT_OPENGL	= 
 # OpenGL
 SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
@@ -46,7 +46,7 @@
 SYSCONF_LIBS_THREAD	= 
 
 # Meta-object compiler
-SYSCONF_MOC		= $(QTDIR)/bin/moc
+SYSCONF_MOC		= $(QTDIR)/bin/moc2
 
 # UI compiler
 SYSCONF_UIC		= $(QTDIR)/bin/uic
@@ -60,1 +60,1 @@
-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ)
@@ -65,6 +65,4 @@
 				 cd $(DESTDIR) && \
-				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+				 rm -f lib$(TARGET).so;\
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
 
@@ -77,8 +75,8 @@
 SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
 # Compiling application source
-SYSCONF_CXXFLAGS	= -pipe -fno-exceptions -g
-SYSCONF_CFLAGS		= -pipe -fno-exceptions -g
+SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g
+SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g
 # Default link type (static linking is still be used where required)
 SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
 SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)