moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Replace @VAR@ in Makefile.am files with $VAR

Browse Source
This commit is contained in:
Giuseppe Scrivano 2014-06-11 16:24:20 +02:00
parent dd1b69c600
commit d1ab00cab4
9 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com> 2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com>
* Makefile.am: Remove @VAR@ with $FOO.
* util/Makefile.am: Likewise.
* ABOUT-NLS: Remove terminating empty lines. * ABOUT-NLS: Remove terminating empty lines.
* MAILING-LIST: Likewise. * MAILING-LIST: Likewise.
* util/rmold.pl: Likewise. * util/rmold.pl: Likewise.

2
Makefile.am
View File

@ -27,7 +27,7 @@
# as that of the covered work. # as that of the covered work.
# #
# Version: @VERSION@ # Version: $(VERSION)
# #

2
doc/ChangeLog
View File

@ -1,5 +1,7 @@
2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com> 2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com>
* Makefile.am: Remove @VAR@ with $FOO.
* fdl.texi: Remove terminating empty lines. * fdl.texi: Remove terminating empty lines.
2014-06-10 Giuseppe Scrivano <gscrivan@redhat.com> 2014-06-10 Giuseppe Scrivano <gscrivan@redhat.com>

11
doc/Makefile.am
View File

@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
# Version: @VERSION@ # Version: $(VERSION)
# #
# Program to convert DVI files to PostScript # Program to convert DVI files to PostScript
@ -28,7 +28,6 @@ manext = 1
RM = rm -f RM = rm -f
TEXI2POD = $(srcdir)/texi2pod.pl TEXI2POD = $(srcdir)/texi2pod.pl
POD2MAN = @POD2MAN@
MAN = wget.$(manext) MAN = wget.$(manext)
WGETRC = $(sysconfdir)/wgetrc WGETRC = $(sysconfdir)/wgetrc
SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
@ -39,7 +38,7 @@ SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
man_MANS = $(MAN) man_MANS = $(MAN)
all: wget.info @COMMENT_IF_NO_POD2MAN@$(MAN) all: wget.info $(COMMENT_IF_NO_POD2MAN)$(MAN)
everything: all wget_us.ps wget_a4.ps wget_toc.html everything: all wget_us.ps wget_a4.ps wget_toc.html
@ -57,7 +56,7 @@ wget.pod: $(srcdir)/wget.texi version.texi
$(TEXI2POD) -D VERSION="$(VERSION)" $(srcdir)/wget.texi $@ $(TEXI2POD) -D VERSION="$(VERSION)" $(srcdir)/wget.texi $@
$(MAN): wget.pod $(MAN): wget.pod
$(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@ $(POD2MAN) --center="GNU Wget" --release="GNU Wget $(VERSION)" $? > $@
#wget.cat: $(MAN) #wget.cat: $(MAN)
# nroff -man $? > $@ # nroff -man $? > $@
@ -76,10 +75,10 @@ wget_toc.html: $(srcdir)/wget.texi
# #
# install all the documentation # install all the documentation
install-data-local: install.wgetrc @COMMENT_IF_NO_POD2MAN@install.man install-data-local: install.wgetrc $(COMMENT_IF_NO_POD2MAN)install.man
# uninstall all the documentation # uninstall all the documentation
uninstall-local: @COMMENT_IF_NO_POD2MAN@uninstall.man uninstall-local: $(COMMENT_IF_NO_POD2MAN)uninstall.man
# install man page, creating install directory if necessary # install man page, creating install directory if necessary

2
src/ChangeLog
View File

@ -1,5 +1,7 @@
2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com> 2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com>
* Makefile.am: Remove @VAR@ with $FOO.
* DESCRIP_MODS.MMS: Remove terminating empty lines. * DESCRIP_MODS.MMS: Remove terminating empty lines.
* DESCRIP_SRC.MMS: Likewise. * DESCRIP_SRC.MMS: Likewise.
* convert.c: Likewise. * convert.c: Likewise.

8
src/Makefile.am
View File

@ -28,7 +28,7 @@
# as that of the covered work. # as that of the covered work.
# #
# Version: @VERSION@ # Version: $(VERSION)
# #
if IRI_IS_ENABLED if IRI_IS_ENABLED
@ -36,8 +36,8 @@ IRI_OBJ = iri.c
endif endif
# The following line is losing on some versions of make! # The following line is losing on some versions of make!
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" DEFS += -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) LIBS += $(LIBICONV) $(LIBINTL) $(LIB_CLOCK_GETTIME)
EXTRA_DIST = css.l css.c css_.c build_info.c.in EXTRA_DIST = css.l css.c css_.c build_info.c.in
@ -74,7 +74,7 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a
echo '/* version.c */' > $@ echo '/* version.c */' > $@
echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@ echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
echo '' >> $@ echo '' >> $@
echo 'const char *version_string = "@VERSION@";' >> $@ echo 'const char *version_string = "$(VERSION)";' >> $@
echo 'const char *compilation_string = "'$(COMPILE)'";' \ echo 'const char *compilation_string = "'$(COMPILE)'";' \
| $(ESCAPEQUOTE) >> $@ | $(ESCAPEQUOTE) >> $@
echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \ echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \

2
tests/ChangeLog
View File

@ -1,5 +1,7 @@
2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com> 2014-06-11 Giuseppe Scrivano <gscrivan@redhat.com>
* Makefile.am: Remove @VAR@ with $FOO.
* FTPTest.pm: Remove terminating empty lines. * FTPTest.pm: Remove terminating empty lines.
* HTTPServer.pm: Likewise. * HTTPServer.pm: Likewise.
* HTTPTest.pm: Likewise. * HTTPTest.pm: Likewise.

4
tests/Makefile.am
View File

@ -28,13 +28,13 @@
# as that of the covered work. # as that of the covered work.
# #
# Version: @VERSION@ # Version: $(VERSION)
# #
PERL = perl PERL = perl
PERLRUN = $(PERL) -I$(srcdir) PERLRUN = $(PERL) -I$(srcdir)
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) LIBS += $(LIBICONV) $(LIBINTL) $(LIB_CLOCK_GETTIME)
.PHONY: test run-unit-tests run-px-tests .PHONY: test run-unit-tests run-px-tests

2
util/Makefile.am
View File

@ -27,7 +27,7 @@
# as that of the covered work. # as that of the covered work.
# #
# Version: @VERSION@ # Version: $(VERSION)
# #
EXTRA_DIST = README rmold.pl trunc.c EXTRA_DIST = README rmold.pl trunc.c