diff options
-rw-r--r-- | libextra/gl/Makefile.am | 2 | ||||
-rw-r--r-- | libextra/gl/m4/gnulib-cache.m4 | 6 | ||||
-rw-r--r-- | libextra/gl/m4/gnulib-comp.m4 | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libextra/gl/Makefile.am b/libextra/gl/Makefile.am index f8b1591bb0..70cf00c0b4 100644 --- a/libextra/gl/Makefile.am +++ b/libextra/gl/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 +# Reproduce by: gnulib-tool --import --dir=. --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 AUTOMAKE_OPTIONS = 1.5 gnits diff --git a/libextra/gl/m4/gnulib-cache.m4 b/libextra/gl/m4/gnulib-cache.m4 index 4c8cdeb6cf..d44f334d1b 100644 --- a/libextra/gl/m4/gnulib-cache.m4 +++ b/libextra/gl/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 +# gnulib-tool --import --dir=. --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=../build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -24,8 +24,8 @@ gl_MODULES([ crypto/md5 ]) gl_AVOID([dummy stdint]) -gl_SOURCE_BASE([libextra/gl]) -gl_M4_BASE([libextra/gl/m4]) +gl_SOURCE_BASE([gl]) +gl_M4_BASE([gl/m4]) gl_PO_BASE([]) gl_DOC_BASE([doc]) gl_TESTS_BASE([tests]) diff --git a/libextra/gl/m4/gnulib-comp.m4 b/libextra/gl/m4/gnulib-comp.m4 index 2cff4a82b7..2389317aea 100644 --- a/libextra/gl/m4/gnulib-comp.m4 +++ b/libextra/gl/m4/gnulib-comp.m4 @@ -15,7 +15,7 @@ # In projects using CVS, this file can be treated like other built files. -# This macro should be invoked from ./configure.in, in the section +# This macro should be invoked from ./configure.ac, in the section # "Checks for programs", right after AC_PROG_CC, and certainly before # any checks for libraries, header files, types and library functions. AC_DEFUN([xgl_EARLY], @@ -27,7 +27,7 @@ AC_DEFUN([xgl_EARLY], AC_REQUIRE([AC_PROG_RANLIB]) ]) -# This macro should be invoked from ./configure.in, in the section +# This macro should be invoked from ./configure.ac, in the section # "Check for header files, types and library functions". AC_DEFUN([xgl_INIT], [ @@ -39,7 +39,7 @@ AC_DEFUN([xgl_INIT], m4_pushdef([xgl_LIBSOURCES_LIST], []) m4_pushdef([xgl_LIBSOURCES_DIR], []) gl_COMMON - gl_source_base='libextra/gl' + gl_source_base='gl' gl_HMAC_MD5 gl_MD5 gl_MEMXOR @@ -135,7 +135,7 @@ AC_DEFUN([xgl_REPLACE_FUNCS], [ AC_DEFUN([xgl_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([xgl_LIBSOURCES_DIR], [libextra/gl]) + m4_define([xgl_LIBSOURCES_DIR], [gl]) m4_append([xgl_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) |