So far, gnulib-tool replaces build-aux with $auxdir in the configure.ac
snippet but not in the Makefile.am snippet. And there is - unless the
standard automake $(top_srcdir) - no standard $(auxdir) or similar that
could be used from any Makefile.am. This fixes it.

2006-11-12  Bruno Haible  <[EMAIL PROTECTED]>

        * gnulib-tool (func_emit_lib_Makefile_am): Replace occurrences of
        '$(top_srcdir)/build-aux/', taking into account the real auxdir.

*** gnulib-20061108-modified/gnulib-tool        2006-11-13 02:40:41.000000000 
+0100
--- gnulib-20061108/gnulib-tool 2006-11-13 03:29:23.000000000 +0100
***************
*** 1158,1163 ****
--- 1158,1164 ----
  # - 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,1280 ****
      echo "AM_CPPFLAGS ="
    fi
    echo
!   cat allsnippets.tmp
    echo
    echo "mostlyclean-local: mostlyclean-generic"
    echo "      @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
--- 1275,1282 ----
      echo "AM_CPPFLAGS ="
    fi
    echo
!   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 \\"


Reply via email to