@@ -9,7 +9,7 @@ all-local: 		menu init
 distclean-local:
 		rm -f *\~
 init: 			init.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" init.in > init
+	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" $(srcdir)/init.in > init
 
 menu: 			../util/fluxbox-generate_menu
 	env	MENUFILENAME=menu \

@@ -10,4 +10,4 @@ distclean-local:
 	rm -f *\~
 
 fluxbox.1: fluxbox.1.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," fluxbox.1.in > fluxbox.1
+	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1

@@ -29,7 +29,7 @@ DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
 DEFAULT_KEYSFILE=$(pkgdatadir)/keys
 DEFAULT_INITFILE=
 
-AM_CPPFLAGS=@CPPFLAGS@ -IFbTk
+AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk
 
 bin_PROGRAMS= fluxbox
 BUILT_SOURCES = defaults.hh

@@ -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 @@ 
 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
 

@@ -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

@@ -20,7 +20,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
 # AM_PATH_XFT1([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-AC_DEFUN(AM_PATH_XFT1,
+AC_DEFUN([AM_PATH_XFT1],
 [
 	AC_CHECK_LIB(Xft, XftFontOpen,
 		XFT_LIBS="-lXft"
@@ -30,7 +30,7 @@ )
 ])
 
 # AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-AC_DEFUN(AM_PATH_XFT2,
+AC_DEFUN([AM_PATH_XFT2],
 [
 	if test x$pkg_exec_prefix != x ; then
 	   xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
@@ -59,7 +59,7 @@ ])
 
 # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 # Test for Xft, and define XFT_CFLAGS and XFT_LIBS
-AC_DEFUN(AM_PATH_XFT,
+AC_DEFUN([AM_PATH_XFT],
 [
  AC_ARG_WITH(xft-prefix,[  --with-xft-prefix=path  Prefix where Xft is installed (optional)],
             xft_prefix="$withval", xft_prefix="")