summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-05 19:22:44 +0000
committerRoland McGrath <roland@gnu.org>1996-06-05 19:22:44 +0000
commitdf7c0d2312a2133aece4a390ce05c756c5e452a5 (patch)
tree0c18425a4045eecff03c12ed81c36c429b4723da
parentaa592a63f9c6541bc4661eed409b89248a58f311 (diff)
Wed Jun 5 15:10:58 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Make-dist [subdir-dirs]: Set vpath for %, not just %.c.
-rw-r--r--Make-dist2
-rw-r--r--Makerules4
-rw-r--r--locale/Makefile1
3 files changed, 4 insertions, 3 deletions
diff --git a/Make-dist b/Make-dist
index 018fd75e2b..02bffc4877 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 6c35fe5e2b..e2878e17e5 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 e0618c0a01..5038519341 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