--- Makefile.skel.orig	2010-06-12 16:42:31.000000000 +0100
+++ Makefile.skel	2010-06-12 16:54:10.000000000 +0100
@@ -39,12 +39,10 @@
 VERSION = 0.8.1
 DATE    = 01/06/2010
 
-COMPILE = $(CC) -Wall -g `xml2-config --cflags` `gsl-config --cflags` -c -I $(CWD)/src
-LINK    = $(CC) -Wall -g `xml2-config --libs`   `gsl-config --libs`   -lm $(LINK_FFTW) $(LINK_READLINE) -lz -lpng -lkpathsea
+COMPILE = $(CC) -Wall `xml2-config --cflags` `pkg-config --cflags gsl cfitsio` -c -I $(CWD)/src
+LIBS    = `xml2-config --libs` `pkg-config --libs gsl` $(LINK_FFTW) $(LINK_READLINE) -lm -lz -lpng -lkpathsea
 
-OPTIMISATION = -O0
-
-DEBUG   = -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0
+DEBUG   = -g -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0
 NODEBUG = -D DEBUG=0 -D MEMDEBUG1=0 -D MEMDEBUG2=0
 
 LOCAL_SRCDIR = src
@@ -101,15 +99,15 @@
 
 $(LOCAL_OBJDIR)/%.o:         $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools 
-	$(COMPILE) $(OPTIMISATION) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@
+	$(COMPILE) $(CFLAGS) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@
 
 $(LOCAL_OBJDIR)/%.debug.o:   $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools
-	$(COMPILE) $(OPTIMISATION) $(DEBUG)   $(DEBUG_SWITCHES)     $< -o $@
+	$(COMPILE) $(CFLAGS) $(DEBUG)   $(DEBUG_SWITCHES)     $< -o $@
 
 $(LOCAL_OBJDIR)/%.install.o: $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools
-	$(COMPILE) $(OPTIMISATION) $(NODEBUG) $(INSTALL_SWITCHES)   $< -o $@
+	$(COMPILE) $(CFLAGS) $(NODEBUG) $(INSTALL_SWITCHES)   $< -o $@
 
 #
 # Make the pyxplot binaries
@@ -117,17 +115,17 @@
 
 $(LOCAL_BINDIR)/pyxplot:         $(PPL_OBJECTS)
 	mkdir -p $(LOCAL_BINDIR)
-	$(LINK) $(OPTIMISATION) $(PPL_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot
+	$(CC) $(LDFLAGS) $(PPL_OBJECTS) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot
 
 $(LOCAL_BINDIR)/debug/pyxplot:   $(PPL_OBJECTS_DEBUG)
 	mkdir -p $(LOCAL_BINDIR)/debug
 	echo "The files in this directory are binaries with debugging options enabled: they produce activity logs called 'pyxplot.log'. It should be noted that these binaries can up to ten times slower than non-debugging versions." > $(LOCAL_BINDIR)/debug/README
-	$(LINK) $(OPTIMISATION) $(PPL_OBJECTS_DEBUG)   -o $(LOCAL_BINDIR)/debug/pyxplot
+	$(CC) $(LDFLAGS) $(PPL_OBJECTS_DEBUG) $(LIBS)  -o $(LOCAL_BINDIR)/debug/pyxplot
 
 $(LOCAL_BINDIR)/install/pyxplot: $(PPL_OBJECTS_INSTALL)
 	mkdir -p $(LOCAL_BINDIR)/install
 	echo "The files in this directory are binaries intended to be installed with 'make install'. They should not be used in their present location, as they contain hard-coded links to files which are created by the 'make install' step." > $(LOCAL_BINDIR)/debug/README
-	$(LINK) $(OPTIMISATION) $(PPL_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot
+	$(CC) $(LDFLAGS) $(PPL_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot
 
 #
 # Make the pyxplot_watch binaries
@@ -135,15 +133,15 @@
 
 $(LOCAL_BINDIR)/pyxplot_watch:         $(PPLW_OBJECTS)
 	mkdir -p $(LOCAL_BINDIR)
-	$(LINK) $(OPTIMISATION) $(PPLW_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot_watch
+	$(CC) $(LDFLAGS) $(PPLW_OBJECTS) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot_watch
 
 $(LOCAL_BINDIR)/debug/pyxplot_watch:   $(PPLW_OBJECTS_DEBUG)
 	mkdir -p $(LOCAL_BINDIR)/debug
-	$(LINK) $(OPTIMISATION) $(PPLW_OBJECTS_DEBUG)   -o $(LOCAL_BINDIR)/debug/pyxplot_watch
+	$(CC) $(LDFLAGS) $(PPLW_OBJECTS_DEBUG) $(LIBS)  -o $(LOCAL_BINDIR)/debug/pyxplot_watch
 
 $(LOCAL_BINDIR)/install/pyxplot_watch: $(PPLW_OBJECTS_INSTALL)
 	mkdir -p $(LOCAL_BINDIR)/install
-	$(LINK) $(OPTIMISATION) $(PPLW_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_watch
+	$(CC) $(LDFLAGS) $(PPLW_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_watch
 
 #
 # Make fits helper binaries
@@ -151,11 +149,11 @@
 
 $(LOCAL_BINDIR)/pyxplot_fitshelper:         $(FITSHELP_OBJECTS)
 	mkdir -p $(LOCAL_BINDIR)
-	$(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot_fitshelper
+	$(CC) $(LDFLAGS) $(FITSHELP_OBJECTS) $(LINK_FITSIO) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot_fitshelper
 
 $(LOCAL_BINDIR)/install/pyxplot_fitshelper: $(FITSHELP_OBJECTS_INSTALL)
 	mkdir -p $(LOCAL_BINDIR)/install
-	$(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
+	$(CC) $(LDFLAGS) $(FITSHELP_OBJECTS_INSTALL) $(LINK_FITSIO) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
 
 #
 # Make time helper
--- configure.orig	2010-06-12 16:42:24.000000000 +0100
+++ configure	2010-06-12 16:55:52.000000000 +0100
@@ -185,7 +185,7 @@
  rm -f conf.*
  echo "YES"
  echo "HAVE_READLINE=-D HAVE_READLINE=1" >> Makefile
- echo "LINK_READLINE=-ltermcap -lreadline" >> Makefile
+ echo "LINK_READLINE=-lreadline" >> Makefile
 else
  rm -f conf.*
  echo "NO"
@@ -200,8 +200,8 @@
 then
  rm -f conf.*
  echo "YES"
- echo "HAVE_FITSIO=-D HAVE_FITSIO=1" >> Makefile
- echo "LINK_FITSIO=-lcfitsio" >> Makefile
+ echo "HAVE_FITSIO=-D HAVE_FITSIO=1 `pkg-config --cflags cfitsio`" >> Makefile
+ echo "LINK_FITSIO=`pkg-config --libs cfitsio`" >> Makefile
 else
  rm -f conf.*
  echo "NO"