diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-07 15:36:15 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-07 15:36:15 -0200 |
| commit | 90a343b898dabb8cac5ec831b45e20b1abd306ac (patch) | |
| tree | b315952290081733783edf1804c3711719788355 | |
| parent | 8256de6062eb150c612ef09a1ae855de0a0cba6c (diff) | |
Correct build on systems that did not yet upgrade to libtool-2.2
Also correct lib Changelog generation by running "git log" instead of
"git-log", what should work on all versions of git.
The libtool correction issue is probably a hack over several other
hacks. The proper correction should be to ensure that AC_PROG_SED is run
before the AC_CONFIG_COMMANDS([libtool_hack],...), what appears to be the
case in latest libtool, but not 1.5.x.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 82c3f5d..6cdbece 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,6 @@ MAINTAINERCLEANFILES=ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index e8c56b3..b65f7a6 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ PKG_PROG_PKG_CONFIG AC_PROG_SED AC_CONFIG_COMMANDS([libtool_hack], [ cp -f libtool libtool_ + test -z "$SED" && SED=sed $SED '1,/^soname_spec/{ /^soname_spec/i\ # X.Org hack to match monolithic Xaw SONAME\ |