* Makefile.am (INSTALL.txt): Don't use $@ and $< in non suffix

rules.
From Marc Espie.
* Makefile.maint (release-archive-dir): Rename as...
(release_archive_dir): this, so that it can be specialized in
Makefile.
This commit is contained in:
Akim Demaille 2001-07-17 07:29:35 +00:00
parent d6f581d73c
commit d467ad19b9
7 changed files with 46 additions and 35 deletions

View File

@ -1,3 +1,12 @@
2001-07-17 Akim Demaille <akim@epita.fr>
* Makefile.am (INSTALL.txt): Don't use $@ and $< in non suffix
rules.
From Marc Espie.
* Makefile.maint (release-archive-dir): Rename as...
(release_archive_dir): this, so that it can be specialized in
Makefile.
2001-07-14 Akim Demaille <akim@epita.fr>
* configure.in: Bump to 2.50d.

View File

@ -25,9 +25,10 @@ be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change
it or regenerate `configure' using a newer version of `autoconf'.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
The simplest way to compile this package is:

View File

@ -85,10 +85,10 @@ $(srcdir)/acversion.m4: $(srcdir)/acversion.in $(srcdir)/configure.in
# INSTALL is a special case. Automake seems to have a single name space
# for both targets and variables. If we just use INSTALL, then the var
# $(INSTALL) is not defined, and the install target fails.
MAKEINFO = @MAKEINFO@ --no-headers --no-validate --no-split
INSTALL.txt: $(top_srcdir)/doc/install.texi
$(MAKEINFO) $< --no-headers --no-validate --no-split --output=$@
if test '$(srcdir)' != '.'; then cp $@ $(srcdir); rm -f $@; fi
$(MAKEINFO) $(top_srcdir)/doc/install.texi --output=$(srcdir)/INSTALL.txt
cp $(srcdir)/INSTALL.txt $(srcdir)/INSTALL
MAINTAINERCLEANFILES = acversion.m4 INSTALL.txt
@ -220,7 +220,7 @@ autoconf.m4f: $(m4sources)
## ---------------------------- ##
prev_version_file = $(srcdir)/config/prev-version.txt
release-archive-dir = releases
release_archive_dir = releases
# Uploading betas.
hosts = alpha

View File

@ -103,13 +103,18 @@ CLEANFILES = autoconf.m4f $(bin_SCRIPTS)
move_if_change = $(top_srcdir)/config/move-if-change
# INSTALL is a special case. Automake seems to have a single name space
# for both targets and variables. If we just use INSTALL, then the var
# $(INSTALL) is not defined, and the install target fails.
MAKEINFO = @MAKEINFO@ --no-headers --no-validate --no-split
MAINTAINERCLEANFILES = acversion.m4 INSTALL.txt
edit = sed -e 's,@SHELL\@,$(SHELL),g' -e 's,@PERL\@,$(PERL),g' -e 's,@datadir\@,$(pkgdatadir),g' -e 's,@bindir\@,$(bindir),g' -e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g' -e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g' -e 's,@M4\@,$(M4),g' -e 's,@AWK\@,$(AWK),g' -e 's,@VERSION\@,$(VERSION),g' -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
prev_version_file = $(srcdir)/config/prev-version.txt
release-archive-dir = releases
release_archive_dir = releases
# Uploading betas.
hosts = alpha
@ -432,14 +437,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
$(srcdir)/acversion.m4: $(srcdir)/acversion.in $(srcdir)/configure.in
sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/acversion.in >acversion.tm4
mv acversion.tm4 $(srcdir)/acversion.m4
# INSTALL is a special case. Automake seems to have a single name space
# for both targets and variables. If we just use INSTALL, then the var
# $(INSTALL) is not defined, and the install target fails.
INSTALL.txt: $(top_srcdir)/doc/install.texi
$(MAKEINFO) $< --no-headers --no-validate --no-split --output=$@
if test '$(srcdir)' != '.'; then cp $@ $(srcdir); rm -f $@; fi
$(MAKEINFO) $(top_srcdir)/doc/install.texi --output=$(srcdir)/INSTALL.txt
cp $(srcdir)/INSTALL.txt $(srcdir)/INSTALL
maintainer-check: maintainer-check-tests
maintainer-check-tests:

View File

@ -17,7 +17,7 @@ my_distdir = $(PACKAGE)-$(VERSION)
# Old releases are stored here.
# Used for diffs and xdeltas.
release-archive-dir ?= ../release
release_archive_dir ?= ../release
@ -44,12 +44,12 @@ po-check:
# Check that `make alpha' will not fail at the end of the process.
writable-files:
if test -d $(release-archive-dir); then :; else \
mkdir $(release-archive-dir); \
if test -d $(release_archive_dir); then :; else \
mkdir $(release_archive_dir); \
fi
for file in $(distdir).tar.gz $(xd-delta) \
$(release-archive-dir)/$(distdir).tar.gz \
$(release-archive-dir)/$(xd-delta); do \
$(release_archive_dir)/$(distdir).tar.gz \
$(release_archive_dir)/$(xd-delta); do \
test -e $$file || continue; \
test -w $$file \
|| { echo ERROR: $$file is not writable; fail=1; }; \
@ -250,12 +250,12 @@ check-copyright:
alpha: local-check
$(MAKE) cvs-dist
$(MAKE) -s announcement > /tmp/announce-$(my_distdir)
ln $(distdir).tar.gz $(release-archive-dir)
ln $(distdir).tar.gz $(release_archive_dir)
chmod a-w $(distdir).tar.gz
cd $(release-archive-dir) \
cd $(release_archive_dir) \
&& xdelta delta -9 $(prev-tgz) $(distdir).tar.gz $(xd-delta) || :
ln $(release-archive-dir)/$(xd-delta) .
chmod a-w $(release-archive-dir)/$(xd-delta)
ln $(release_archive_dir)/$(xd-delta) .
chmod a-w $(release_archive_dir)/$(xd-delta)
echo $(VERSION) > $(prev_version_file)
cvs ci -m. $(prev_version_file)
@$(emit-rsync-commands)

1
THANKS
View File

@ -90,6 +90,7 @@ Kurt D. Zeilenga kurt@openldap.org
Larry Schwimmer rosebud@cyclone.stanford.edu
Lars Hecking lhecking@nmrc.ucc.ie
Lars J. Aas larsa@sim.no
Marc Espie Marc.Espie@liafa.jussieu.fr
Marcus Daniels marcus@sysc.pdx.edu
Marcus Thiessel marcus@xemacs.org
Mark Elbrecht snowball3@usa.net

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.50 for GNU Autoconf 2.50c.
# Generated by Autoconf 2.50 for GNU Autoconf 2.50d.
#
# Report bugs to <bug-autoconf@gnu.org>.
#
@ -146,8 +146,8 @@ mandir='${prefix}/man'
# Identity of this package.
PACKAGE_NAME='GNU Autoconf'
PACKAGE_TARNAME='autoconf'
PACKAGE_VERSION='2.50c'
PACKAGE_STRING='GNU Autoconf 2.50c'
PACKAGE_VERSION='2.50d'
PACKAGE_STRING='GNU Autoconf 2.50d'
PACKAGE_BUGREPORT='bug-autoconf@gnu.org'
ac_prev=
@ -535,7 +535,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<EOF
\`configure' configures GNU Autoconf 2.50c to adapt to many kinds of systems.
\`configure' configures GNU Autoconf 2.50d to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -597,7 +597,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GNU Autoconf 2.50c:";;
short | recursive ) echo "Configuration of GNU Autoconf 2.50d:";;
esac
cat <<\EOF
@ -644,7 +644,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\EOF
GNU Autoconf configure 2.50c
GNU Autoconf configure 2.50d
generated by GNU Autoconf 2.50
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@ -659,7 +659,7 @@ cat >&5 <<EOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by GNU Autoconf $as_me 2.50c, which was
It was created by GNU Autoconf $as_me 2.50d, which was
generated by GNU Autoconf 2.50. Invocation command line was
$ $0 $@
@ -1077,7 +1077,7 @@ fi
PACKAGE=autoconf
VERSION=2.50c
VERSION=2.50d
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ { echo "$as_me:1083: error: source directory already configured; run \"make distclean\" there first" >&5
@ -1619,7 +1619,7 @@ EOF
cat >>$CONFIG_STATUS <<EOF
ac_cs_version="\\
GNU Autoconf config.status 2.50c
GNU Autoconf config.status 2.50d
configured by $0, generated by GNU Autoconf 2.50,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@ -1711,7 +1711,7 @@ cat >&5 << _ACEOF
## Running config.status. ##
## ----------------------- ##
This file was extended by $as_me (GNU Autoconf 2.50c) 2.50, executed with
This file was extended by $as_me (GNU Autoconf 2.50d) 2.50, executed with
> $ac_cs_invocation
on `(hostname || uname -n) 2>/dev/null | sed 1q`
@ -2009,7 +2009,7 @@ if test "$no_create" != yes; then
fi
# Report the state of this version of Autoconf if this is a beta.
case 2.50c in
case 2.50d in
*[a-z]*)
cat <<EOF