--- Makefile.orig	Sat Dec  1 10:36:43 2001
+++ Makefile	Sat Jan 19 16:07:48 2002
@@ -1,26 +1,25 @@
 # XDrawChem configuration stuff
 # INSTDIR: The directory where the binary will go.  Should be in your path.
-#          The default is /usr/local/bin
+#          The default is ${PREFIX}/bin
 # INSTRING: The directory where you will store ring templates (without quotes).
 # RINGDIR: The directory where you will store ring templates (with quotes).
 # INSTRING and RINGDIR should be the same :)
-# Default should be /usr/local/lib/xdrawchem
+# Default should be ${PREFIX}/lib/xdrawchem
 # if you change RINGDIR, remember to put "\" before the directory,
 # and \"" after it, so the preprocessor will insert quotes correctly
 # SERVER: database server.  OK to set to "herger.ibb.gatech.edu";
 #         as of version 0.98, there are no other servers  :)
 
-INSTDIR = /usr/local/bin
-INSTRING = /usr/local/lib/xdrawchem
-RINGDIR = "\"/usr/local/lib/xdrawchem/\""
+INSTDIR = ${PREFIX}/bin
+INSTRING = ${PREFIX}/share/xdrawchem
+RINGDIR = "\"${PREFIX}/share/xdrawchem/\""
 SERVER = "\"herger.ibb.gatech.edu\""
 
 ## Platform-specific flags -- uncomment appropriate section
 ## For Linux, SGI IRIX 6.5 using gcc/g++
-CXX	=	g++
-INCPATH =	-I/usr/include -I$(QTDIR)/include
-LIBS	=	-lqt -lXext -lX11 -lm
-MOC	=	$(QTDIR)/bin/moc
+INCPATH =	-I$(QTDIR)/include/qt2
+LIBS	=	-lqt2 -lXext -lX11 -lm
+MOC	=	$(QTDIR)/bin/moc2
 
 ## for Sun
 #CXX	=	CC
@@ -37,10 +36,9 @@
 ## end of platform-specific flags
 
 ## other compiler flags
-CXXFLAGS = -g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
-CC	=	gcc
-CFLAGS	=	-g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
-LFLAGS	=	-g -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
+CXXFLAGS += -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
+CFLAGS	+=	-DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
+LFLAGS	+=	-L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
 
 
 ####### Target