diff options
| author | Roland McGrath <roland@gnu.org> | 1996-06-28 11:42:05 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-06-28 11:42:05 +0000 |
| commit | de6b062321f6631c49119190dc63b00a566148df (patch) | |
| tree | 59482c6f7bc38de66b83752d144c1411cc5043c0 /rpm | |
| parent | 6dbe2837567f528faa015fd0cf1536201dde5ffd (diff) | |
| download | glibc-de6b062321f6631c49119190dc63b00a566148df.tar.gz glibc-de6b062321f6631c49119190dc63b00a566148df.tar.xz glibc-de6b062321f6631c49119190dc63b00a566148df.zip | |
Fri Jun 28 07:27:10 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* string/strndup.c (strndup): Always terminate the string. * string/string.h (strndupa): Likewise. Thu Jun 27 14:22:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio/Makefile (routines): Add vscanf. * stdio-common/Makefile (routines): Remove vscanf. * stdio-common/vscanf.c: Move to ... * stdio/vscanf.c: here. * rpm/Makefile (headers, install-lib, install-lib.so, versioned, install-bin, install-sbin, install-data, install-others): Add $(-VARIABLE).
Diffstat (limited to 'rpm')
| -rw-r--r-- | rpm/Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/rpm/Makefile b/rpm/Makefile index 36e91b9add..148a3a19d6 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -15,15 +15,17 @@ distinfo := $(common-objpfx)distinfo- \ config = $(config-machine)-$(config-vendor)-$(config-os) -headers := $(foreach d,$(subdirs),$($d-headers)) -install-lib := $(foreach d,$(subdirs),$($d-install-lib)) -install-lib.so := $(foreach d,$(subdirs),$(filter-out $($d-versioned),\ +headers := $(-headers) $(foreach d,$(subdirs),$($d-headers)) +install-lib := $(-install-lib) $(foreach d,$(subdirs),$($d-install-lib)) +install-lib.so := $(-install-lib.so) \ + $(foreach d,$(subdirs),$(filter-out $($d-versioned),\ $($d-install-lib.so))) -versioned := $(foreach d,$(subdirs),$($d-versioned)) -install-bin := $(foreach d,$(subdirs),$($d-install-bin)) -install-sbin := $(foreach d,$(subdirs),$($d-install-sbin)) -install-data := $(foreach d,$(subdirs),$($d-install-data)) -install-others := $(foreach d,$(subdirs),$($d-install-others)) +versioned := $(-versioned) $(foreach d,$(subdirs),$($d-versioned)) +install-bin := $(-install-bin) $(foreach d,$(subdirs),$($d-install-bin)) +install-sbin := $(-install-sbin) $(foreach d,$(subdirs),$($d-install-sbin)) +install-data := $(-install-data) $(foreach d,$(subdirs),$($d-install-data)) +install-others := $(-install-others) \ + $(foreach d,$(subdirs),$($d-install-others)) # Notice things to be installed in /etc. They get specially marked as # possibly user-modified config files. |