---- conky-1.4.9/src/Makefile.am~ 2007-10-23 23:52:12.000000000 +0200
-+++ conky-1.4.9/src/Makefile.am 2007-11-30 00:10:13.000000000 +0100
-@@ -25,7 +25,7 @@
+--- conky-1.6.1/src/Makefile.am 2008-08-12 22:49:11.000000000 +0200
++++ conky-1.6.1/src/Makefile.am-new 2008-09-21 11:06:13.714222266 +0200
+@@ -24,7 +24,7 @@
+ #
# $Id$
- INCLUDES = \
-- -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\"
-+ -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky.conf\"
+-INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\"
++INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky.conf\"
bin_PROGRAMS = conky
---- conky-1.4.9/data/Makefile.am~ 2007-10-23 23:52:12.000000000 +0200
-+++ conky-1.4.9/data/Makefile.am 2007-11-30 00:16:42.000000000 +0100
+--- conky-1.6.1/data/Makefile.am 2007-11-27 23:31:13.000000000 +0100
++++ conky-1.6.1/data/Makefile.am-new 2008-09-21 11:11:46.257955236 +0200
@@ -24,7 +24,7 @@
#
# $Id$