diff options
Diffstat (limited to 'libc/Makefile')
| -rw-r--r-- | libc/Makefile | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libc/Makefile b/libc/Makefile index 51d10b97b..ff821e677 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -147,16 +147,22 @@ $(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \ $(shlib-lds) $(build-shlib) +ifeq (,$(filter sunrpc,$(subdirs))) +$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a + $(make-target-directory) + ln -f $< $@ +else $(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \ $(common-objpfx)sunrpc/librpc_compat_pic.a - $(..)./scripts/mkinstalldirs $(common-objpfx)linkobj + $(make-target-directory) (cd $(common-objpfx)linkobj; \ $(AR) x ../libc_pic.a; \ rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \ $(AR) x ../sunrpc/librpc_compat_pic.a; \ $(AR) cr libc_pic.a *.os; \ rm *.os) -endif +endif # $(subdirs) contains sunrpc +endif # $(build-shared) # This is a handy script for running any dynamically linked program against @@ -423,8 +429,13 @@ endif INSTALL: manual/install.texi manual/macros.texi \ $(common-objpfx)manual/pkgvers.texi makeinfo --no-validate --plaintext --no-number-sections \ - -I$(common-objpfx)manual $< -o $@ - -chmod a-w $@ + -I$(common-objpfx)manual $< -o $@-tmp + $(AWK) 'NF == 0 { ++n; next } \ + NF != 0 { while (n-- > 0) print ""; n = 0; print }' \ + < $@-tmp > $@-tmp2 + rm -f $@-tmp + -chmod a-w $@-tmp2 + mv -f $@-tmp2 $@ $(common-objpfx)manual/%: FORCE $(MAKE) $(PARALLELMFLAGS) -C manual $@ FORCE: |