Mercurial > gnulib
changeset 27335:edbb3cba56e9
Replace build-aux/ also in the Makefile snippet.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 13 Nov 2006 12:35:41 +0000 |
| parents | 4c79ad403923 |
| children | f48508429c6d |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Nov 13 12:35:01 2006 +0000 +++ b/ChangeLog Mon Nov 13 12:35:41 2006 +0000 @@ -1,3 +1,8 @@ +2006-11-12 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_emit_lib_Makefile_am): Replace occurrences of + '$(top_srcdir)/build-aux/', taking into account the real auxdir. + 2006-11-12 Bruno Haible <bruno@clisp.org> * gnulib-tool: New option --local-symlink.
--- a/gnulib-tool Mon Nov 13 12:35:01 2006 +0000 +++ b/gnulib-tool Mon Nov 13 12:35:41 2006 +0000 @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-11-13 12:35:01 $' +cvsdatestamp='$Date: 2006-11-13 12:35:41 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` nl=' @@ -1158,6 +1158,7 @@ # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name +# - auxdir directory relative to destdir where to place build aux files # - makefile_name from --makefile-name # - libtool true if libtool will be used, false or blank otherwise # - macro_prefix prefix of gl_LIBOBJS macros to use @@ -1274,7 +1275,8 @@ echo "AM_CPPFLAGS =" fi echo - cat allsnippets.tmp + cat allsnippets.tmp \ + | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo echo "mostlyclean-local: mostlyclean-generic" echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"