From dfe1754a556c167df741843ef0114f5325717a7c Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Wed, 5 Jun 1996 23:25:04 +0000
Subject: * time/tzfile.h, time/private.h, time/zdump.c, time/zic.c,

 	time/africa, time/asia, time/australasia, time/europe,
 	time/northamerica, time/southamerica: Updated from ADO 96h.

	* Make-dist (all-headers): Filter $(sysdep_headers) out of $(headers).
	(try-sysdeps, +sysdep-names): Check sysdeps/libm-ieee754 too.

	* Makerules (distinfo-vars): Add sysdep_headers.
	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Append to
	this instead of $(headers).
	* sysdeps/unix/sysv/linux/alpha/Makefile: Likewise.

	* Make-dist [subdirs-dirs]: Don't prefix $(subdir-dirs) with
	$(subdir); we are already there.

	* sysdeps/unix/sysv/sysv4/solaris2/sparc/Dist: Removed.
---
 Make-dist | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'Make-dist')

diff --git a/Make-dist b/Make-dist
index 02bffc4877..f0c1620654 100644
--- a/Make-dist
+++ b/Make-dist
@@ -48,7 +48,7 @@ endif
 # where source files might be found.
 
 ifdef	subdir
-all-headers = $(headers)
+all-headers = $(filter-out $(sysdep_headers),$(headers))
 else
 +distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t \
 		     inhibit_interface_rules=t inhibit_mach_syscalls=t \
@@ -67,16 +67,20 @@ foo:=$(shell echo 'IS THIS WORKING??? all-headers=$(all-headers)' >&2)
 		  $(filter %.c %.S %.s %.h %.sub,$(distribute))
 foo:=$(shell echo '+maybe-sysdeps=$(+maybe-sysdeps)'>&2)
 # Find all the files that have a stub or generic version.
-try-sysdeps := $(foreach dir,$(..)sysdeps/stub $(..)sysdeps/generic,\
+try-sysdeps := $(foreach dir,$(..)sysdeps/stub $(..)sysdeps/generic \
+			     $(..)sysdeps/libm-ieee754,\
 			     $(addprefix $(dir)/,$(+maybe-sysdeps)))
 foo:=$(shell echo 'try-sysdeps=$(try-sysdeps)'>&2)
 +sysdeps := $(wildcard $(try-sysdeps))
 foo:=$(shell echo 'stub/generic +sysdeps=$(+sysdeps)'>&2)
-+sysdep-names := $(sort $(notdir $(+sysdeps)))
++sysdep-names := $(sort $(patsubst $(..)sysdeps/generic/%,%,\
+				   $(patsubst $(..)sysdeps/stub/%,%,\
+				   $(patsubst $(..)sysdeps/libm-ieee754/%,%,\
+					      $(+sysdeps)))))
 foo:=$(shell echo '+sysdep-names=$(+sysdep-names)' >&2)
 
 ifdef subdir-dirs
-vpath % $(addprefix $(subdir)/,$(subdir-dirs))
+vpath % $(subdir-dirs)
 endif
 
 # Now find all the sysdep versions of those files.
-- 
cgit v1.2.3