diff options
| author | Roland McGrath <roland@gnu.org> | 2007-07-24 23:09:42 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2007-07-24 23:09:42 +0000 |
| commit | 80d4c3b06ebec23c32335d530d5d3f956dcff65b (patch) | |
| tree | dffd4cb11f23bff8b13a4c762a164a3fc32e0948 | |
| parent | ff40792e78600bf9a4293f6d9dff587b5b949af1 (diff) | |
| download | glibc-80d4c3b06ebec23c32335d530d5d3f956dcff65b.tar.gz glibc-80d4c3b06ebec23c32335d530d5d3f956dcff65b.tar.xz glibc-80d4c3b06ebec23c32335d530d5d3f956dcff65b.zip | |
* Makerules (install-others-programs-nosubdir): New target.
(install-no-libc.a-nosubdir): Depend on it. * iconv/Makefile (install-others-programs): Set this instead of install-others. * login/Makefile (install-others-programs): Likewise. * posix/Makefile (install-others-programs): Likewise. * Makerules (install-no-libc.a-nosubdir): Clean up conditional dependencies.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Makerules | 22 |
2 files changed, 24 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 287371551d..fb271a998f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-07-24 Roland McGrath <roland@redhat.com> + + * Makerules (install-others-programs-nosubdir): New target. + (install-no-libc.a-nosubdir): Depend on it. + + * iconv/Makefile (install-others-programs): Set this instead of + install-others. + * login/Makefile (install-others-programs): Likewise. + * posix/Makefile (install-others-programs): Likewise. + + * Makerules (install-no-libc.a-nosubdir): Clean up conditional + dependencies. + 2007-07-23 Ulrich Drepper <drepper@redhat.com> * io/Makefile (tests): Add tst-posix_fallocate. diff --git a/Makerules b/Makerules index 03f39a7441..efd2fba58d 100644 --- a/Makerules +++ b/Makerules @@ -834,12 +834,13 @@ force-install: # $(install-lib) are installed from the object directory into $(libdir); # files in $(install-lib) matching `lib%.a' are ranlib'd after installation -# unless they also appear in $(non-lib.a). $(install-data) are installed -# as they are into $(datadir). $(headers) are installed as they are in +# unless they also appear in $(non-lib.a). $(install-data) are installed as +# they are into $(datadir). $(headers) are installed as they are in # $(includedir). $(install-bin), $(install-bin-script) and $(install-sbin) # are installed from the object directory into $(bindir), $(bindir) and -# $(sbindir), respectively. $(install-others) are absolute path names of -# files to install; rules to install them are defined elsewhere. +# $(sbindir), respectively. $(install-others) and $(install-others-programs) +# are absolute path names of files to install; rules to install them are +# defined elsewhere. # The simple library name to install libc.a under. # This could be defined by a sysdep Makefile. @@ -1144,6 +1145,7 @@ install-lib-nosubdir: $(addprefix $(inst_libdir)/,\ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) install-others-nosubdir: $(install-others) +install-others-programs-nosubdir: $(install-others-programs) # We need all the `-nosubdir' targets so that `install' in the parent # doesn't depend on several things which each iterate over the subdirs. @@ -1152,14 +1154,12 @@ install-others-nosubdir: $(install-others) install-%:: install-%-nosubdir ; .PHONY: install install-no-libc.a-nosubdir -ifeq ($(build-programs),yes) -install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\ - install-bin-nosubdir install-bin-script-nosubdir \ - install-lib-nosubdir install-others-nosubdir \ - install-rootsbin-nosubdir install-sbin-nosubdir -else -install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\ +install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \ install-lib-nosubdir install-others-nosubdir +ifeq ($(build-programs),yes) +install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ + install-rootsbin-nosubdir install-sbin-nosubdir \ + install-others-programs-nosubdir endif install: install-no-libc.a-nosubdir |