From 0d556354c775cf23051178caa610336a171d0cc1 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 3 Apr 2011 15:53:19 +0000
Subject: Ship only the root ChangeLog

* Makeconf (distfiles): Remove ChangeLog.
* Makefile (DIST_FILES): Add ChangeLog.
---
 Makeconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makeconf')

diff --git a/Makeconf b/Makeconf
index 8c2bd0c9..5e33e15b 100644
--- a/Makeconf
+++ b/Makeconf
@@ -382,7 +382,7 @@ $(..)$(dir).d: $(srcdir)/Makefile
 	echo $(dir): $(hurd-bug-addr-dir-dep) $(addprefix lib,$(HURDLIBS)) > $@
 
 # Making a snapshot
-distfiles = Makefile ChangeLog $(SRCS) $(LCLHDRS) $(DIST_FILES)
+distfiles = Makefile $(SRCS) $(LCLHDRS) $(DIST_FILES)
 lndist: $(distfiles) $(top_srcdir)/hurd-snap/$(dir) FORCE
 	ln $(addprefix $(srcdir)/,$(distfiles)) $(top_srcdir)/hurd-snap/$(dir)
 
-- 
cgit v1.2.3


From 3aa7bb4849945c7480873567767db3face604260 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Thu, 20 Oct 2011 15:47:00 +0200
Subject: Populate a [build]/lib directory with links to all shared libraries.

* Makeconf (libs): Add dependency to create these links.
---
 Makeconf | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Makeconf')

diff --git a/Makeconf b/Makeconf
index 5e33e15b..49375fba 100644
--- a/Makeconf
+++ b/Makeconf
@@ -273,6 +273,15 @@ $(libdir)/$(libname).so: $(libdir)/$(libname).so.$(hurd-version)
 $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includedir)/$(installhdrsubdir)/%: %
 	$(INSTALL_DATA) $< $@
 
+# Arrange to have the shared libraries available locally in one single
+# directory.  This is not used by the build system itself, but is just for easy
+# testing.
+local-libdir = lib
+../$(local-libdir)/$(libname).so.$(hurd-version): $(libname).so.$(hurd-version)
+	@test -d $(@D)/ || $(MKINSTALLDIRS) $(@D)
+	ln -sf ../$(dir)/$< $@
+libs: ../$(local-libdir)/$(libname).so.$(hurd-version)
+
 endif
 
 # Provide default.
-- 
cgit v1.2.3


From 05f5cc229323a61799388fbb52da84ca8cb502c9 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 20 Nov 2011 18:55:26 +0100
Subject: configure: Use modern `AC_INIT' invocation.

* Makeconf (hurd-version): Move to...
* config.make.in (hurd-version): ... here.  Set to @PACKAGE_VERSION@.

* configure.in: Change `AC_INIT' invocation to specify the package name,
  version number, and bug report address.
---
 Makeconf       | 3 ---
 config.make.in | 3 +++
 configure.in   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makeconf')

diff --git a/Makeconf b/Makeconf
index 49375fba..b6134ef4 100644
--- a/Makeconf
+++ b/Makeconf
@@ -35,9 +35,6 @@
 # Put this first so it's the default
 all:
 
-# What version of the Hurd is this?
-hurd-version := 0.3
-
 # Figure out how to locate the parent directory from here.
 ifeq (.,$(dir))
 .. =
diff --git a/config.make.in b/config.make.in
index 41452464..fe4b1e65 100644
--- a/config.make.in
+++ b/config.make.in
@@ -1,5 +1,8 @@
 # @configure_input@
 
+# What version of the Hurd is this?
+hurd-version := @PACKAGE_VERSION@
+
 # Machine architecture.
 machine = @host_cpu@
 asm_syntax = @asm_syntax@
diff --git a/configure.in b/configure.in
index 635242d2..05b959b0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION([$Id: configure.in,v 1.38 2008/11/17 11:34:18 tschwinge Exp $])
 AC_PREREQ(2.54)			dnl Minimum Autoconf version required.
-AC_INIT
+AC_INIT([GNU Hurd], [0.3], [bug-hurd@gnu.org])
 AC_CONFIG_SRCDIR([hurd/hurd_types.h])	dnl File to look for in srcdir.
 
 AC_PREFIX_DEFAULT()		dnl Default to empty prefix, not /usr/local.
-- 
cgit v1.2.3