2 files changed, 6 insertions, 6 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
index c5fb97a..66376f4 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
 # util/Makefile.am for Fluxbox
 SUBDIRS=                fbrun
-INCLUDES=               -I../src/FbTk/
+INCLUDES=               -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
 bin_SCRIPTS=            fbsetbg fluxbox-generate_menu startfluxbox
 bin_PROGRAMS=           bsetroot
 bsetroot_SOURCES=       bsetroot.cc bsetroot.hh
@@ -16,18 +16,18 @@ all-local:	startfluxbox
 clean-local:
                 rm -f startfluxbox fluxbox-generate_menu
 
-bsetroot.o:     bsetroot.cc ../config.h bsetroot.hh \
-                        ../src/FbRootWindow.hh ../src/FbAtoms.hh
+bsetroot.o:     bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \
+                        $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
 
 startfluxbox:   startfluxbox.in
                 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
                             -e "s,@pkgbindir@,$(bindir),g" \
-                                startfluxbox.in > startfluxbox
+                                $(srcdir)/startfluxbox.in > startfluxbox
                 -chmod 755 startfluxbox
 
 fluxbox-generate_menu: fluxbox-generate_menu.in
                 @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
-                                fluxbox-generate_menu.in \
+                                $(srcdir)/fluxbox-generate_menu.in \
                                 > fluxbox-generate_menu
                 -chmod 755 fluxbox-generate_menu
 
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
index 6f4752a..83b45b0 100644
--- a/util/fbrun/Makefile.am
+++ b/util/fbrun/Makefile.am
@@ -1,5 +1,5 @@
 FLUXBOX_SRC_DIR=        ../../src/
-INCLUDES=               -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk
+INCLUDES=               -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
 bin_PROGRAMS=           fbrun
 fbrun_SOURCES=          FbRun.hh FbRun.cc main.cc fbrun.xpm
 fbrun_LDADD=            ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a