From f486b43c2341ec6934468ef58da4ff2812028ef8 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 27 Mar 2001 03:23:59 -0800 Subject: [PATCH] [svn] * {.,doc,src,util,windows}/Makefile.in: Moved top_builddir out of "User configuration section" of top Makefile and analogous spot in others. * po/Makefile.in.in: Previous addition of top_builddir to po/Makefile.in was bogus -- it's generated from po/Makefile.in.in. --- ChangeLog | 6 ++++++ Makefile.in | 4 ++-- doc/ChangeLog | 5 +++++ doc/Makefile.in | 4 ++-- po/Makefile.in.in | 2 ++ src/ChangeLog | 5 +++++ src/Makefile.in | 4 ++-- util/Makefile.in | 4 ++-- windows/Makefile.in | 4 ++-- 9 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69fadae9..2f97e2e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,12 @@ in checks for -ldl, necessary since the libcrypto shared library doesn't record its dependency on libdl. + * {.,util,windows}/Makefile.in: Moved top_builddir out of "User + configuration section" of top Makefile and analogous spot in others. + + * po/Makefile.in.in: Previous addition of top_builddir to + po/Makefile.in was bogus -- it's generated from po/Makefile.in.in. + 2001-03-26 Dan Harkless * TODO: -p should probably go "_two_ more hops" on pages. diff --git a/Makefile.in b/Makefile.in index 497f1f95..724a5226 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,8 @@ SHELL = /bin/sh @SET_MAKE@ +top_builddir = . + srcdir = @srcdir@ VPATH = @srcdir@ @@ -41,8 +43,6 @@ mandir = @mandir@ manext = 1 localedir = $(prefix)/share/locale -top_builddir = . - CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ diff --git a/doc/ChangeLog b/doc/ChangeLog index b0a747c1..f17694d9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2001-03-27 Dan Harkless + + * Makefile.in: Moved top_builddir out of "User configuration + section" of top Makefile and analogous spot in this one. + 2001-03-26 Dan Harkless * wget.texi (Recursive Retrieval Options): Explained that you need diff --git a/doc/Makefile.in b/doc/Makefile.in index 80393316..0d881967 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -30,6 +30,8 @@ DVIPS = dvips -D 300 # Program to convert texinfo files to html TEXI2HTML = texi2html -expandinfo -split_chapter +top_builddir = .. + top_srcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -40,8 +42,6 @@ mandir = @mandir@ manext = 1 sysconfdir = @sysconfdir@ -top_builddir = .. - INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ RM = rm -f diff --git a/po/Makefile.in.in b/po/Makefile.in.in index f99b94b6..59d1ddef 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -12,6 +12,8 @@ VERSION = @VERSION@ SHELL = /bin/sh @SET_MAKE@ +top_builddir = .. + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ diff --git a/src/ChangeLog b/src/ChangeLog index cffeb30c..cde4136e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-03-27 Dan Harkless + + * Makefile.in: Moved top_builddir out of "User configuration + section" of top Makefile and analogous spot in this one. + 2001-03-17 Dan Harkless * Makefile.in: Include @SSL_INCLUDES@ substition in INCLUDES. diff --git a/src/Makefile.in b/src/Makefile.in index 77e1934e..9742b7e2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -21,6 +21,8 @@ SHELL = /bin/sh +top_builddir = .. + top_srcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -33,8 +35,6 @@ bindir = @bindir@ sysconfdir = @sysconfdir@ localedir = $(prefix)/share/locale -top_builddir = .. - CC = @CC@ CPPFLAGS = @CPPFLAGS@ # The following line is losing on some versions of make! diff --git a/util/Makefile.in b/util/Makefile.in index af3c9d29..9c6224ef 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -21,11 +21,11 @@ SHELL = /bin/sh +top_builddir = .. + srcdir = @srcdir@ VPATH = @srcdir@ -top_builddir = .. - RM = rm -f all: diff --git a/windows/Makefile.in b/windows/Makefile.in index 77bc0380..3b36965f 100644 --- a/windows/Makefile.in +++ b/windows/Makefile.in @@ -25,11 +25,11 @@ SHELL = /bin/sh +top_builddir = .. + srcdir = @srcdir@ VPATH = @srcdir@ -top_builddir = .. - RM = rm -f all: -- 2.39.2