From df7c0d2312a2133aece4a390ce05c756c5e452a5 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 5 Jun 1996 19:22:44 +0000 Subject: Wed Jun 5 15:10:58 1996 Roland McGrath * Make-dist [subdir-dirs]: Set vpath for %, not just %.c. --- Make-dist | 2 +- Makerules | 4 ++-- locale/Makefile | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Make-dist b/Make-dist index 018fd75..02bffc4 100644 --- a/Make-dist +++ b/Make-dist @@ -76,7 +76,7 @@ foo:=$(shell echo 'stub/generic +sysdeps=$(+sysdeps)'>&2) foo:=$(shell echo '+sysdep-names=$(+sysdep-names)' >&2) ifdef subdir-dirs -vpath %.c $(addprefix $(subdir)/,$(subdir-dirs)) +vpath % $(addprefix $(subdir)/,$(subdir-dirs)) endif # Now find all the sysdep versions of those files. diff --git a/Makerules b/Makerules index 6c35fe5..e2878e1 100644 --- a/Makerules +++ b/Makerules @@ -793,8 +793,8 @@ distinfo: Makefile $(..)Makerules define distinfo-vars rm -f $@.new -$(foreach var,subdir subdir-dirs sources elided-routines headers distribute \ - dont_distribute generated others tests \ +$(foreach var,subdir subdir-dirs sources elided-routines sysdep_routines \ + headers distribute dont_distribute generated others tests \ extra-libs $(extra-libs:%=%-routines), echo >> $@.new '$(var) := $($(var))') echo >> $@.new 'sources += $$(addsuffix .c,$$(elided-routines))' diff --git a/locale/Makefile b/locale/Makefile index e0618c0..5038519 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -37,6 +37,7 @@ install-bin = localedef locale extra-objs = $(localedef-modules:=.o) $(locale-modules:=.o) \ $(lib-modules:=.o) +subdir-dirs = programs vpath %.c programs vpath %.h programs -- cgit v1.1