aboutsummaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-04-14 03:52:54 +0000
committerRoland McGrath <roland@gnu.org>1995-04-14 03:52:54 +0000
commite215c4786cff3ecc7961a60f5f79bed50f0fe8c1 (patch)
treefbf34cefb203f9aad43128e555c89ef700c6ea80 /Makerules
parent335aa3209b5d597a93733a7313e629e202731078 (diff)
downloadglibc-e215c4786cff3ecc7961a60f5f79bed50f0fe8c1.tar
glibc-e215c4786cff3ecc7961a60f5f79bed50f0fe8c1.tar.gz
glibc-e215c4786cff3ecc7961a60f5f79bed50f0fe8c1.tar.bz2
glibc-e215c4786cff3ecc7961a60f5f79bed50f0fe8c1.zip
* Makefile (distribute): Add ChangeLog.[0-9].
* configure.in: Add check for .set directive. * config.h.in: Add #undef HAVE_ASM_SET_DIRECTIVE. * Makerules [! subdir] (O%-lib): Don't prepend ../. * sysdeps/generic/expm1.c: #undef expm1 before weak_alias. See ChangeLog.4 for earlier changes.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makerules b/Makerules
index b155c5551f..64282fb8ec 100644
--- a/Makerules
+++ b/Makerules
@@ -376,7 +376,11 @@ $(foreach o,$(object-suffixes),$(objpfx)stamp$o-$(subdir)): \
$(AR) cru$(verbose) ${O%-lib} \
$(patsubst $(objpfx)%,%,$^)
touch $@
+ifdef subdir
O%-lib = $(filter ../,$(firstword $(objdir) ../))$(patsubst %,$(libtype$*),c)
+else
+O%-lib = $(patsubst %,$(libtype$*),c)
+endif
endif