diff -r -u powertweak-0.1.14/configure.in new/configure.in
--- powertweak-0.1.14/configure.in	Tue May 16 19:24:04 2000
+++ new/configure.in	Sat May 20 19:24:28 2000
@@ -1,24 +1,20 @@
 dnl Process this file with autoconf to produce a configure script.
+AC_INIT(src/common.c)
+AM_CONFIG_HEADER(config.h)
 
 PACKAGE=powertweak
 PT_VERSION=0.1.14
 PT_SUFFIX=alpha
+PT_DATADIR="$datadir/powertweak"
 
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(PT_VERSION, "$PT_VERSION")
-AC_DEFINE_UNQUOTED(PT_SUFFIX, "$PT_SUFFIX")
-
-AC_DEFINE_UNQUOTED(PT_DATADIR, "$(datadir)/powertweak")
+dnl AC_DEFINE_UNQUOTED(XMLFILE, $PT_DATADIR/filename.whatever)
+dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+dnl AC_DEFINE_UNQUOTED(PT_VERSION, "$PT_VERSION")
+dnl AC_DEFINE_UNQUOTED(PT_SUFFIX, "$PT_SUFFIX")
 
-AC_SUBST(PACKAGE)
-AC_SUBST(PT_VERSION)
-AC_SUBST(PT_SUFFIX)
-AC_SUBST(PT_DATADIR)
-
-AC_INIT(src/common.c)
-AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE($PACKAGE, $PT_VERSION$PT_SUFFIX)
 
+
 AC_ISC_POSIX
 AC_PROG_CC
 AC_ARG_PROGRAM
@@ -50,6 +46,11 @@
 AC_C_INLINE
 AC_TYPE_SIZE_T
 
+AC_SUBST(PACKAGE)
+AC_SUBST(PT_VERSION)
+AC_SUBST(PT_SUFFIX)
+AC_SUBST(PT_DATADIR)
+
 dnl PCILIB configure
 AC_CONFIG_SUBDIRS(src/lib/)
 
@@ -57,6 +58,8 @@
 AC_FUNC_MMAP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(strerror strspn strtol strtoul)
+
+
 
 AC_OUTPUT([
 	Makefile
diff -r -u powertweak-0.1.14/src/GUI/GTK/Makefile.am new/src/GUI/GTK/Makefile.am
--- powertweak-0.1.14/src/GUI/GTK/Makefile.am	Mon May 15 00:47:54 2000
+++ new/src/GUI/GTK/Makefile.am	Sat May 20 19:46:45 2000
@@ -1,8 +1,8 @@
 SUBDIRS = gadgets hardware proc
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/include \
-	-DPOWERTWEAK_VERSION="@PT_VERSION@@PT_SUFFIX@" \
-	-DXMLFILE="@PT_DATADIR@/procentry.xml"
+	-DPOWERTWEAK_VERSION="\"@PT_VERSION@@PT_SUFFIX@"\" \
+	-DXMLFILE=\""@PT_DATADIR@/procentry.xml"\"
 
 CFLAGS = -Wall -Werror -O2 -g $(GTK_CFLAGS)
 
diff -r -u powertweak-0.1.14/src/include/procxml.h new/src/include/procxml.h
--- powertweak-0.1.14/src/include/procxml.h	Tue May 16 19:35:26 2000
+++ new/src/include/procxml.h	Sat May 20 19:25:09 2000
@@ -4,8 +4,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#define XMLFILE "procentry.xml"
-
 struct xml_item;
 
 struct xml_item {
diff -r -u powertweak-0.1.14/src/lib/Makefile new/src/lib/Makefile
--- powertweak-0.1.14/src/lib/Makefile	Fri Apr 21 23:03:45 2000
+++ new/src/lib/Makefile	Sat May 20 19:53:52 2000
@@ -40,6 +40,8 @@
 
 all: libpci.a
 
+install: all
+
 libpci.a: $(OBJS)
 	rm -f $@
 	ar rcs $@ $^
diff -r -u powertweak-0.1.14/src/main/Makefile.am new/src/main/Makefile.am
--- powertweak-0.1.14/src/main/Makefile.am	Mon May 15 00:06:20 2000
+++ new/src/main/Makefile.am	Sat May 20 19:41:21 2000
@@ -1,6 +1,6 @@
 SUBDIRS = hardware proc
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/include -DPOWERTWEAK_VERSION="@PT_VERSION@@PT_SUFFIX@"
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/include -DPOWERTWEAK_VERSION="\"@PT_VERSION@@PT_SUFFIX@"\"
 
 CFLAGS = -Wall -Werror -O2 -g