mirror of https://github.com/moparisthebest/wget
Revert "Replace @VAR@ in Makefile.am files with $VAR"
This reverts commit d1ab00cab4.
Conflicts:
tests/Makefile.am
This commit is contained in:
Giuseppe Scrivano
parent
3697fd9451
commit
e5cb0f77e6
|
|
@ -1,3 +1,7 @@
|
|||
2014-10-28 Giuseppe Scrivano <gscrivan@redhat.com>
|
||||
|
||||
* Makefile.am: Replace $FOO with @VAR@.
|
||||
|
||||
2013-10-22 Ángel González <keisial@gmail.com>
|
||||
|
||||
* bootstrap.conf (gnulib_modules): Add module xstrndup.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
# as that of the covered work.
|
||||
|
||||
#
|
||||
# Version: $(VERSION)
|
||||
# Version: @VERSION@
|
||||
#
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2014-10-28 Giuseppe Scrivano <gscrivan@redhat.com>
|
||||
|
||||
* Makefile.am: Replace $FOO with @VAR@.
|
||||
|
||||
2014-09-08 Darshit Shah <darnir@gmail.com>
|
||||
|
||||
* wget.texi (symbolic links): Update documentation of retr-symlinks to
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#
|
||||
# Version: $(VERSION)
|
||||
# Version: @VERSION@
|
||||
#
|
||||
|
||||
# Program to convert DVI files to PostScript
|
||||
|
|
@ -28,6 +28,7 @@ manext = 1
|
|||
RM = rm -f
|
||||
|
||||
TEXI2POD = $(srcdir)/texi2pod.pl
|
||||
POD2MAN = @POD2MAN@
|
||||
MAN = wget.$(manext)
|
||||
WGETRC = $(sysconfdir)/wgetrc
|
||||
SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
|
||||
|
|
@ -38,7 +39,7 @@ SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
|
|||
|
||||
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
|
||||
|
||||
|
|
@ -56,7 +57,7 @@ wget.pod: $(srcdir)/wget.texi version.texi
|
|||
$(TEXI2POD) -D VERSION="$(VERSION)" $(srcdir)/wget.texi $@
|
||||
|
||||
$(MAN): wget.pod
|
||||
$(POD2MAN) --center="GNU Wget" --release="GNU Wget $(VERSION)" $? > $@
|
||||
$(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@
|
||||
|
||||
#wget.cat: $(MAN)
|
||||
# nroff -man $? > $@
|
||||
|
|
@ -75,10 +76,10 @@ wget_toc.html: $(srcdir)/wget.texi
|
|||
#
|
||||
|
||||
# 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-local: $(COMMENT_IF_NO_POD2MAN)uninstall.man
|
||||
uninstall-local: @COMMENT_IF_NO_POD2MAN@uninstall.man
|
||||
|
||||
|
||||
# install man page, creating install directory if necessary
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2014-10-28 Giuseppe Scrivano <gscrivan@redhat.com>
|
||||
|
||||
* Makefile.am: Replace $FOO with @VAR@.
|
||||
|
||||
2014-09-08 Darshit Shah <darnir@gmail.com>
|
||||
|
||||
* ftp.c (ftp_retrieve_glob): Also check for invalid entries along with
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
# as that of the covered work.
|
||||
|
||||
#
|
||||
# Version: $(VERSION)
|
||||
# Version: @VERSION@
|
||||
#
|
||||
|
||||
if IRI_IS_ENABLED
|
||||
|
|
@ -36,8 +36,8 @@ IRI_OBJ = iri.c
|
|||
endif
|
||||
|
||||
# The following line is losing on some versions of make!
|
||||
DEFS += -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
|
||||
LIBS += $(LIBICONV) $(LIBINTL) $(LIB_CLOCK_GETTIME)
|
||||
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
|
||||
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME)
|
||||
|
||||
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 '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
|
||||
echo '' >> $@
|
||||
echo 'const char *version_string = "$(VERSION)";' >> $@
|
||||
echo 'const char *version_string = "@VERSION@";' >> $@
|
||||
echo 'const char *compilation_string = "'$(COMPILE)'";' \
|
||||
| $(ESCAPEQUOTE) >> $@
|
||||
echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2014-10-28 Giuseppe Scrivano <gscrivan@redhat.com>
|
||||
|
||||
* Makefile.am: Replace $FOO with @VAR@.
|
||||
|
||||
2014-10-06 Tim Ruehsen <tim.ruehsen@gmx.de>
|
||||
|
||||
* Test-iri.px: fixed encodings
|
||||
|
|
|
|||
|
|
@ -30,10 +30,9 @@
|
|||
# see http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html#Parallel-Test-Harness
|
||||
|
||||
#
|
||||
# Version: $(VERSION)
|
||||
# Version: @VERSION@
|
||||
#
|
||||
|
||||
|
||||
../src/wget$(EXEEXT):
|
||||
cd ../src && $(MAKE) $(AM_MAKEFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
# as that of the covered work.
|
||||
|
||||
#
|
||||
# Version: $(VERSION)
|
||||
# Version: @VERSION@
|
||||
#
|
||||
|
||||
EXTRA_DIST = README rmold.pl trunc.c
|
||||
|
|
|
|||
Loading…
Reference in New Issue