* Makefile.am (regen-am, $(srcdir)/headers.mk): Here. --- milena/ChangeLog | 6 ++++++ milena/Makefile.am | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f17e773..ca94bc7 100644 --- a/milena/ChangeLog +++ b/milena/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-25 Fabien Freling <fabien.freling@lrde.epita.fr> Update inter-pixel demo. diff --git a/milena/Makefile.am b/milena/Makefile.am index f08e193..21ab235 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -70,7 +71,9 @@ REGEN_SUBDIRS += doc tests # # Hence the redundant action. There may be a better solution regen-am: - cd $(srcdir) && $(top_srcdir)/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + mln headers.mk nodist-headers EXTRA_DIST = nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: @@ -78,7 +81,9 @@ EXTRA_DIST = nodist-headers # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh nodist-headers - cd $(srcdir) && $(top_srcdir)/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + mln headers.mk nodist-headers include $(srcdir)/headers.mk -- 1.6.3.1