fix out-of-tree builds

diff --git a/ChangeLog b/ChangeLog
index b6909b0..4d3f268 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
+2009-07-19
+       * Fixed out-of-tree builds
+
 2009-07-18
        * Update MPD elapsed/progress when stopped (sf.net #2792113)
 
 2009-07-18
-       * add compilation switch --enable-xoap to be able to use
+       * Added compilation switch --enable-xoap to be able to use
        www.weather.com as a source of weather data (this avoids adding
        libxml2 as a required dependency for users that wish to use noaa
        and not weather.com)

diff --git a/lua/Makefile.am b/lua/Makefile.am
index 031f7c1..e0eec9c 100644 (file)
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -35,7 +35,7 @@ libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS)
 libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) -ltolua++
 
 cairo.c: cairo.pkg
-       ${toluapp} -n cairo -o cairo.c cairo.pkg
+       ${toluapp} -n cairo -o cairo.c $(srcdir)/cairo.pkg
 
 endif # BUILD_LUA_CAIRO
 
@@ -47,7 +47,7 @@ libimlib2_la_CFLAGS = $(Imlib2_CFLAGS)
 libimlib2_la_LIBADD = $(Imlib2_LIBS) -ltolua++
 
 imlib2.c: imlib2.pkg
-       ${toluapp} -n imlib2 -o imlib2.c imlib2.pkg
+       ${toluapp} -n imlib2 -o imlib2.c $(srcdir)/imlib2.pkg
 
 endif # BUILD_LUA_IMLIB2
 pkglib_LTLIBRARIES = $(libcairo) $(libimlib2)

diff --git a/src/Makefile.am b/src/Makefile.am
index dbbec2e..a3f9099 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ BUILT_SOURCES = $(config_output)
 CLEANFILES = $(config_output)
 
 $(config_output): ${config_input}
-       sh ../text2c.sh ${config_input} $@ defconfig
+       sh $(srcdir)/../text2c.sh ${config_input} $@ defconfig
 endif # BUILD_CONFIG_OUTPUT
 
 if BUILD_AUDACIOUS
@@ -245,4 +245,4 @@ EXTRA_DIST = \
        imlib2.h
 
 
-# vi:set ts=4 sw=4 noet ai nocindent syntax=automake:
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: