diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
commit | e981cdbd1662ed82436259f1046987c5b7204f1a (patch) | |
tree | 031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/utils/biber | |
parent | 3ad3db6624b55ad14658410f68ab6cb878904c7c (diff) |
Various updates of build system: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS,
Factor recursion into subdirs into .am fragment and m4 macros,
Avoid unnecessary use of Libtool,
Use z_const
git-svn-id: svn://tug.org/texlive/trunk@31606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/biber')
-rw-r--r-- | Build/source/utils/biber/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/utils/biber/Makefile.am | 3 | ||||
-rw-r--r-- | Build/source/utils/biber/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/utils/biber/configure.ac | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Build/source/utils/biber/ChangeLog b/Build/source/utils/biber/ChangeLog index 3d003fe8915..e8e15021cbb 100644 --- a/Build/source/utils/biber/ChangeLog +++ b/Build/source/utils/biber/ChangeLog @@ -1,3 +1,8 @@ +2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop ACLOCAL_AMFLAGS. + * configure.ac: Use AC_CONFIG_MACRO_DIRS. + 2013-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, README, configure.ac, m4/kpse-tl-platform.m4: diff --git a/Build/source/utils/biber/Makefile.am b/Build/source/utils/biber/Makefile.am index 17620693cc9..b0ad714a7e5 100644 --- a/Build/source/utils/biber/Makefile.am +++ b/Build/source/utils/biber/Makefile.am @@ -5,8 +5,7 @@ ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 - +## # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/utils/biber/Makefile.in b/Build/source/utils/biber/Makefile.in index f34fe74f5a7..1a7239e6bde 100644 --- a/Build/source/utils/biber/Makefile.in +++ b/Build/source/utils/biber/Makefile.in @@ -265,7 +265,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 DISTCLEANFILES = config.force nodist_bin_SCRIPTS = $(BIBER_BINARY) diff --git a/Build/source/utils/biber/configure.ac b/Build/source/utils/biber/configure.ac index 2e7bb56bc89..322d9a9f83d 100644 --- a/Build/source/utils/biber/configure.ac +++ b/Build/source/utils/biber/configure.ac @@ -10,7 +10,7 @@ AC_INIT([Biber], [TeX Live], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([../../texk/tests/TeXLive/TLConfig.pm]) AC_CONFIG_AUX_DIR([../../build-aux]) -AC_CONFIG_MACRO_DIR([../../m4]) +AC_CONFIG_MACRO_DIRS([../../m4 m4]) AM_INIT_AUTOMAKE([foreign]) AM_MAINTAINER_MODE |