The following commit has been merged in the mc-4.6 branch: commit e3a3890a3a82500bf3e6b61d28a00f3a5e229f66 Author: Enrico Weigelt, metux IT service <weig...@metux.de> Date: Fri Jan 30 16:46:44 2009 +0100
fixed out-of-tree-builds diff --git a/ChangeLog b/ChangeLog index 04c1af1..982d31b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ +2009-01-30 Enrico Weigelt, metux ITS <weig...@metux.de> + + * src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208 + (out-of-tree builds) + 2009-01-29 Mikhail S. Pobolovets <styx...@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 0166ff7..2fd8a4a 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 a4713a6..c41e300 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 1b05e58..ad62225 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 \ -- Midnight Commander Development _______________________________________________ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel