<<< Date Index >>>     <<< Thread Index >>>

Re: [PATCH] fix reldate.h make rules



On Wed, Jul 12, 2006 at 02:02:34AM +0200, Vincent Lefevre wrote:
> > It seems on some systems, reldate.h is in $top_builddir and in
> > others it is in $top_srcdir. I haven't yet figured out why (no mutt
> > time this week).
> 
> I think the Makefile.am is incorrect:
> 
> BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h
> [...]
> mutt_SOURCES = $(BUILT_SOURCES) \
>         addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
> [...]
> 
> but the built sources should be in $top_builddir, not necessarily
> in the same dir as the other sources (which may be in a read-only
> directory).

This observation seems correct to me; the attached patch (combined with my
previous fix for doc/Makefile.in) provides a fix.

Regards

Christoph

-- 
FH Worms - University of Applied Sciences
Fachbereich Informatik / Telekommunikation
Erenburgerstr. 19, 67549 Worms, Germany
Index: Makefile.am
===================================================================
RCS file: /home/roessler/cvs/mutt/Makefile.am,v
retrieving revision 3.44
diff -u -u -r3.44 Makefile.am
--- Makefile.am 4 Jul 2006 17:11:03 -0000       3.44
+++ Makefile.am 12 Jul 2006 10:34:25 -0000
@@ -13,7 +13,9 @@
 
 bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
 
-BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h
+BUILT_SOURCES = $(top_builddir)/keymap_defs.h \
+       $(top_builddir)/patchlist.c \
+       $(top_builddir)/reldate.h
 
 bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
 mutt_SOURCES = $(BUILT_SOURCES) \
@@ -96,8 +98,7 @@
        cp $(srcdir)/dotlock.c mutt_dotlock.c
 
 CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
-       keymap_alldefs.h keymap_defs.h patchlist.c \
-       reldate.h
+       keymap_alldefs.h $(BUILT_SOURCES)
 
 ACLOCAL_AMFLAGS = -I m4