diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-06-04 19:05:38 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-06-04 19:05:38 +0000 |
| commit | 5649a1d60d4e752b4941663ea63391b5f1a8b7e4 (patch) | |
| tree | 34db6ae3dd1d986185b7d92e7e1cdc8d70766d36 /rpm/Makefile | |
| parent | 2a7b5469ddab5bfb79268d33420853abd2468fce (diff) | |
| download | glibc-5649a1d60d4e752b4941663ea63391b5f1a8b7e4.tar.gz | |
Update.cvs/libc-ud-970604
1997-06-04 20:57 Ulrich Drepper <drepper@cygnus.com>
* manual/string.texi: Add comments to discourage use of index and
rindex.
(strtok, strsep): Apply function on copy of the strings in example.
(l64a): Add example.
* posix/unistd.h: Correct value for _POSIX_VERSION.
* sunrpc/Makefile (defines): Remove definition.
* sysdeps/ieee754/nan.h: Correct typo.
1997-06-04 10:50 Fila Kolodny <fila@ibi.com>
* posix/unistd.h: Add definition of __fchdir corresponding to fchdir.
* login/utmp_daemon.c: Correct location of utmpd.h.
1997-06-03 19:16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makerules: Rename $(common-objpfx)distinfo-$(subdir) to
$(objpfx)distinfo.
* rpm/Makefile (distinfo): Adapted.
1997-06-03 18:32 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* rpm/Makefile (install-slib): Collect shared libraries here
instead of in install-lib, including libc.
(instvars): Add slib.
1997-06-03 18:23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* login/Makefile (libutil-routines): Add updwtmp.
1997-06-03 16:16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* monetary.h: New file, needed for localedata/tst-fmon.c.
1997-06-02 20:31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (cpow_test): Add epsilon for long double in
test for 2^10.
(identities): Add epsilon for float in second identity test.
* sysdeps/m68k/huge_val.h: Change GCC's HUGE_VAL{,F,L} to use
DI and SI mode integers instead of bytes. Fix value of HUGE_VALL.
* sysdeps/m68k/nan.h: New file.
* sysdeps/m68k/fpu/__math.h (isgreater, isgreaterequal, isless,
islessequal, islessgreater, isunordered): Fix assembler syntax.
* sysdeps/m68k/fpu/fraiseexcpt.c: Do it right so that gcc doesn't
optimize out the operations.
* sysdeps/libm-ieee754/s_nan.c: Use NaN macro instead of static
constant.
* sysdeps/libm-ieee754/s_nanf.c: Likewise.
* sysdeps/libm-ieee754/s_nanl.c: Likewise.
* math/carg.c [NO_LONG_DOUBLE]: Add alias for long double
function.
* sysdeps/libm-ieee754/s_erf.c: Likewise.
* sysdeps/libm-ieee754/s_fdim.c: Likewise.
* sysdeps/libm-ieee754/s_fmax.c: Likewise.
* sysdeps/libm-ieee754/s_fmin.c: Likewise.
* sysdeps/libm-ieee754/s_log2.c: Likewise.
* sysdeps/libm-ieee754/s_nan.c: Likewise.
* sysdeps/libm-ieee754/s_remquo.c: Likewise.
Diffstat (limited to 'rpm/Makefile')
| -rw-r--r-- | rpm/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/rpm/Makefile b/rpm/Makefile index 22544506f6..b83b8ea9e9 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -9,8 +9,8 @@ include ../Makeconfig include $(common-objpfx)soversions.mk include $(common-objpfx)version.mk -distinfo := $(common-objpfx)distinfo- \ - $(wildcard $(subdirs:%=$(common-objpfx)distinfo-%)) +distinfo := $(common-objpfx)distinfo \ + $(wildcard $(subdirs:%=$(common-objpfx)%/distinfo)) -include $(distinfo) config = $(config-machine)-$(config-vendor)-$(config-os) @@ -32,14 +32,15 @@ install-others := $(-install-others) \ install-sysconf := $(filter $(sysconfdir)/%,$(install-others)) install-others := $(filter-out $(sysconfdir)/%,$(install-others)) -# Add the unversioned lib*.so's to install-lib. -install-lib += $(install-lib.so) +# Add the unversioned lib*.so's. +install-slib = $(install-lib.so) -# For each versioned lib*.so, add three files: -# lib*-VERSION.so, lib*.so.MAJOR, and lib*.so -install-lib += $(foreach lib,$(versioned),\ - $(patsubst %.so,%-$(version).so,$(lib)) \ - $(lib)$($(lib)-version) $(lib)) +# For each versioned lib*.so, add two files: +# lib*-VERSION.so and lib*.so.MAJOR +install-slib += $(foreach lib,$(versioned),\ + $(patsubst %.so,%-$(version).so,$(lib)) \ + $(lib)$($(lib)-version)) +install-lib += $(versioned) # Add libc.a and libc_p.a. install-lib += $(foreach o,$(filter-out .so,$(object-suffixes)),\ @@ -48,18 +49,17 @@ install-lib += $(foreach o,$(filter-out .so,$(object-suffixes)),\ ifeq (yes,$(build-shared)) # Add libc.so itself, which is a special case in Makerules. ifndef libc.so-version -install-others += $(slibdir)/libc.so +install-slib += libc.so else -install-others += $(libdir)/libc.so \ - $(slibdir)/libc-$(version).so \ - $(slibdir)/libc.so$(libc.so-version) +install-lib += libc.so +install-slib += libc-$(version).so libc.so$(libc.so-version) endif endif all: glibc-$(version).$(config).rpm -instvars = include lib bin sbin data others +instvars = include lib slib bin sbin data others # Generate the rpm spec file for this configuration. $(config): template $(distinfo) Makefile |