* Makefile.am (regen-am, $(srcdir)/headers.mk): Here. --- scribo/ChangeLog | 6 ++++++ scribo/Makefile.am | 17 ++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f255534..8d92970 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2009-06-26 Roland Levillain <roland@lrde.epita.fr> + + Fix path to build-aux/generate_dist_headers.sh in Makefile. + + * Makefile.am (regen-am, $(srcdir)/headers.mk): Here. + 2009-06-23 Guillaume Lazzara <lazzara@lrde.epita.fr> Improve Scribo demo. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index dede79f..4b1c5a2 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -27,23 +27,18 @@ bin: include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += tests -# FIXME: the generation should be done from scribo's directory. regen-am: - cd $(srcdir) && \ - $(top_srcdir)/build-aux/generate_dist_headers.sh\ - . \ - ./headers.mk \ - ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + . headers.mk nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: # # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh - cd $(srcdir) && \ - $(top_srcdir)/build-aux/generate_dist_headers.sh\ - . \ - ./headers.mk \ - ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + . headers.mk nodist-headers include $(srcdir)/headers.mk -- 1.6.3.1