From e3a3890a3a82500bf3e6b61d28a00f3a5e229f66 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT service" <weigelt@metux.de>
Date: Fri, 30 Jan 2009 16:46:44 +0100
Subject: [PATCH] fixed out-of-tree-builds

---
 ChangeLog        |  5 +++++
 edit/Makefile.am |  2 +-
 src/Makefile.am  |  2 +-
 vfs/Makefile.am  | 12 ++++--------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04c1af16d..982d31b3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 
+2009-01-30 Enrico Weigelt, metux ITS <weigelt@metux.de>
+
+	* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
+	  (out-of-tree builds)
+
 2009-01-29 Mikhail S. Pobolovets <styx.mp@gmail.com>
 	* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
 	  odt2txt is now used
diff --git a/edit/Makefile.am b/edit/Makefile.am
index 0166ff725..2fd8a4ab1 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(GLIB_CFLAGS)
+AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 if USE_EDIT
 noinst_LIBRARIES = libedit.a
diff --git a/src/Makefile.am b/src/Makefile.am
index a4713a625..c41e300bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(GLIB_CFLAGS)
+AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 localedir = $(datadir)/locale
 pkglibexecdir =		$(libexecdir)/@PACKAGE@
diff --git a/vfs/Makefile.am b/vfs/Makefile.am
index 1b05e58a5..ad62225f0 100644
--- a/vfs/Makefile.am
+++ b/vfs/Makefile.am
@@ -1,16 +1,12 @@
 if USE_SAMBA_FS
-SUBDIRS = samba extfs
-else
-SUBDIRS = extfs
+SAMBA_CFLAGS  = -DCONFIGDIR=\""@configdir@"\"
+SAMBA_SUBDIRS = samba
 endif
 
 DIST_SUBDIRS = extfs
 
-if USE_SAMBA_FS
-AM_CFLAGS = $(GLIB_CFLAGS) -DCONFIGDIR=\""@configdir@"\"
-else
-AM_CFLAGS = $(GLIB_CFLAGS)
-endif
+SUBDIRS   = extfs $(SAMBA_SUBDIRS)
+AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(SAMBA_CFLAGS)
 
 BASICFILES = 			\
 	cpio.c			\
-- 
2.11.4.GIT