diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile | 10 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2005-01-21 Michael Banck <mbanck@debian.org> + + * Makefile ($(libdir)/libpthread2.a): Install linker script + from $(srcdir) instead of current directory. + ($(libdir)/libpthread2_pic.a): Likewise. + 2005-02-08 Neal H. Walfield <neal@gnu.org> * sysdeps/mach/pt-spin.c (__pthread_spin_lock): Make a weak alias @@ -1,5 +1,5 @@ # -# Copyright (C) 1994,95,96,97,2000,02 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,97,2000,02, 2004 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -181,14 +181,16 @@ install-headers: $(addprefix $(includedir)/, $(sysdeps_headers)) .PHONY: $(libdir)/libpthread.a $(libdir)/libpthread_pic.a # XXX: These rules are a hack. But it is better than messing with -# ../Makeconf at the moment. +# ../Makeconf at the moment. Note that the linker scripts +# $(srcdir)/libpthread.a and $(srcdir)/libpthread_pic.a get overwritten +# when building in $(srcdir) and not a seperate build directory. $(libdir)/libpthread2.a: $(libdir)/libpthread.a mv $< $@ - $(INSTALL_DATA) libpthread.a $< + $(INSTALL_DATA) $(srcdir)/libpthread.a $< $(libdir)/libpthread2_pic.a: $(libdir)/libpthread_pic.a mv $< $@ - $(INSTALL_DATA) libpthread_pic.a $< + $(INSTALL_DATA) $(srcdir)/libpthread_pic.a $< .PHONY: $(addprefix $(includedir)/, $(sysdeps_headers)) |