mirror of
git://git.sv.gnu.org/autoconf
synced 2024-11-21 01:01:48 +08:00
1999-10-31 Ben Elliston <bje@cygnus.com>
* Makefile.am (CLEANFILES): New explicit variable. (editsh): acdatadir is no longer defined, so use pkgdatadir. (editpl): Likewise. From Akim Demaille <akim@epita.fr>. * Makefile.in: Regenerate.
This commit is contained in:
Ben Elliston
parent
cd2f3be239
commit
ccbb05cab2
@ -1,5 +1,10 @@
|
||||
1999-10-31 Ben Elliston <bje@cygnus.com>
|
||||
|
||||
* Makefile.am (CLEANFILES): New explicit variable.
|
||||
(editsh): acdatadir is no longer defined, so use pkgdatadir.
|
||||
(editpl): Likewise. From Akim Demaille <akim@epita.fr>.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
* configure: Regenerate.
|
||||
* aclocal.m4: Generate.
|
||||
* Makefile.in: Regenerate with Automake.
|
||||
|
||||
11
Makefile.am
11
Makefile.am
@ -40,12 +40,17 @@ standards_TEXINFOS = make-stds.texi
|
||||
|
||||
OLDCHANGELOGS = ChangeLog.0 ChangeLog.1
|
||||
EXTRA_DIST = $(OLDCHANGELOGS) \
|
||||
acfunctions acheaders acidentifiers acmakevars \
|
||||
acfunctions acheaders acidentifiers acmakevars \
|
||||
acprograms acconfig.h acgeneral.m4 acoldnames.m4 \
|
||||
acspecific.m4 autoconf.m4 autoheader.m4 acversion.m4.in \
|
||||
autoconf.sh autoheader.sh autoreconf.sh autoupdate.sh \
|
||||
ifnames.sh autoscan.pl INSTALL.txt
|
||||
|
||||
# Files that should be removed, but which Automake does not know.
|
||||
# There are texi2dvi files, frozen files, and the scripts.
|
||||
CLEANFILES = autoconf.cvs autoconf.ev autoconf.evs autoconf.ma autoconf.mas \
|
||||
autoconf.ov autoconf.ovs autoconf.m4f autoheader.m4f $(bin_SCRIPTS)
|
||||
|
||||
# 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.
|
||||
@ -64,10 +69,10 @@ install-data-hook: INSTALL.txt
|
||||
|
||||
# The scripts.
|
||||
|
||||
editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e \
|
||||
editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e \
|
||||
's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' \
|
||||
-e 's,@''SHELL''@,$(SHELL),g'
|
||||
editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
|
||||
.sh:
|
||||
rm -f $@ $@.tmp
|
||||
|
||||
12
Makefile.in
12
Makefile.in
@ -84,14 +84,19 @@ autoconf_TEXINFOS = install.texi
|
||||
standards_TEXINFOS = make-stds.texi
|
||||
|
||||
OLDCHANGELOGS = ChangeLog.0 ChangeLog.1
|
||||
EXTRA_DIST = $(OLDCHANGELOGS) acfunctions acheaders acidentifiers acmakevars acprograms acconfig.h acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 autoheader.m4 acversion.m4.in autoconf.sh autoheader.sh autoreconf.sh autoupdate.sh ifnames.sh autoscan.pl INSTALL.txt
|
||||
EXTRA_DIST = $(OLDCHANGELOGS) acfunctions acheaders acidentifiers acmakevars acprograms acconfig.h acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 autoheader.m4 acversion.m4.in autoconf.sh autoheader.sh autoreconf.sh autoupdate.sh ifnames.sh autoscan.pl INSTALL.txt
|
||||
|
||||
|
||||
# Files that should be removed, but which Automake does not know.
|
||||
# There are texi2dvi files, frozen files, and the scripts.
|
||||
CLEANFILES = autoconf.cvs autoconf.ev autoconf.evs autoconf.ma autoconf.mas autoconf.ov autoconf.ovs autoconf.m4f autoheader.m4f $(bin_SCRIPTS)
|
||||
|
||||
|
||||
# The scripts.
|
||||
|
||||
editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' -e 's,@''SHELL''@,$(SHELL),g'
|
||||
editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' -e 's,@''SHELL''@,$(SHELL),g'
|
||||
|
||||
editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES = acversion.m4
|
||||
@ -513,6 +518,7 @@ installdirs-am:
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-rm -f Makefile $(CONFIG_CLEAN_FILES)
|
||||
|
||||
@ -40,12 +40,17 @@ standards_TEXINFOS = make-stds.texi
|
||||
|
||||
OLDCHANGELOGS = ChangeLog.0 ChangeLog.1
|
||||
EXTRA_DIST = $(OLDCHANGELOGS) \
|
||||
acfunctions acheaders acidentifiers acmakevars \
|
||||
acfunctions acheaders acidentifiers acmakevars \
|
||||
acprograms acconfig.h acgeneral.m4 acoldnames.m4 \
|
||||
acspecific.m4 autoconf.m4 autoheader.m4 acversion.m4.in \
|
||||
autoconf.sh autoheader.sh autoreconf.sh autoupdate.sh \
|
||||
ifnames.sh autoscan.pl INSTALL.txt
|
||||
|
||||
# Files that should be removed, but which Automake does not know.
|
||||
# There are texi2dvi files, frozen files, and the scripts.
|
||||
CLEANFILES = autoconf.cvs autoconf.ev autoconf.evs autoconf.ma autoconf.mas \
|
||||
autoconf.ov autoconf.ovs autoconf.m4f autoheader.m4f $(bin_SCRIPTS)
|
||||
|
||||
# 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.
|
||||
@ -64,10 +69,10 @@ install-data-hook: INSTALL.txt
|
||||
|
||||
# The scripts.
|
||||
|
||||
editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e \
|
||||
editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e \
|
||||
's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' \
|
||||
-e 's,@''SHELL''@,$(SHELL),g'
|
||||
editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
|
||||
.sh:
|
||||
rm -f $@ $@.tmp
|
||||
|
||||
@ -84,14 +84,19 @@ autoconf_TEXINFOS = install.texi
|
||||
standards_TEXINFOS = make-stds.texi
|
||||
|
||||
OLDCHANGELOGS = ChangeLog.0 ChangeLog.1
|
||||
EXTRA_DIST = $(OLDCHANGELOGS) acfunctions acheaders acidentifiers acmakevars acprograms acconfig.h acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 autoheader.m4 acversion.m4.in autoconf.sh autoheader.sh autoreconf.sh autoupdate.sh ifnames.sh autoscan.pl INSTALL.txt
|
||||
EXTRA_DIST = $(OLDCHANGELOGS) acfunctions acheaders acidentifiers acmakevars acprograms acconfig.h acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 autoheader.m4 acversion.m4.in autoconf.sh autoheader.sh autoreconf.sh autoupdate.sh ifnames.sh autoscan.pl INSTALL.txt
|
||||
|
||||
|
||||
# Files that should be removed, but which Automake does not know.
|
||||
# There are texi2dvi files, frozen files, and the scripts.
|
||||
CLEANFILES = autoconf.cvs autoconf.ev autoconf.evs autoconf.ma autoconf.mas autoconf.ov autoconf.ovs autoconf.m4f autoheader.m4f $(bin_SCRIPTS)
|
||||
|
||||
|
||||
# The scripts.
|
||||
|
||||
editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' -e 's,@''SHELL''@,$(SHELL),g'
|
||||
editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' -e 's,@''SHELL''@,$(SHELL),g'
|
||||
|
||||
editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g'
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES = acversion.m4
|
||||
@ -513,6 +518,7 @@ installdirs-am:
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-rm -f Makefile $(CONFIG_CLEAN_FILES)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user