diff options
| author | Julian Elischer <julian@FreeBSD.org> | 1999-09-16 00:28:40 +0000 |
|---|---|---|
| committer | Julian Elischer <julian@FreeBSD.org> | 1999-09-16 00:28:40 +0000 |
| commit | 89c303b0a6e61ff2526f5484b9c1e341e722785b (patch) | |
| tree | ea0b9b9b4b98fff56727a226e47071280d61a820 | |
| parent | a86bf22ca0e8c7c15fea0672a7419124d98a4331 (diff) | |
Notes
| -rw-r--r-- | usr.bin/make/arch.c | 5 | ||||
| -rw-r--r-- | usr.bin/make/config.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index 73d052d7b3a5..b49f3f4c11b4 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -118,7 +118,7 @@ static int ArchFindArchive __P((ClientData, ClientData)); static void ArchFree __P((ClientData)); static struct ar_hdr *ArchStatMember __P((char *, char *, Boolean)); static FILE *ArchFindMember __P((char *, char *, struct ar_hdr *, char *)); -#if defined(__svr4__) || defined(__SVR4) +#if defined(__svr4__) || defined(__SVR4) || defined(__ELF__) #define SVR4ARCHIVES static int ArchSVR4Entry __P((Arch *, char *, size_t, FILE *)); #endif @@ -474,9 +474,8 @@ ArchStatMember (archive, member, hash) * the comparisons easier... */ cp = strrchr (member, '/'); - if (cp != (char *) NULL) { + if ((cp != NULL) && (strcmp(member, RANLIBMAG) != 0)) member = cp + 1; - } ln = Lst_Find (archives, (ClientData) archive, ArchFindArchive); if (ln != NILLNODE) { diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h index 5732247eb83d..9d97eb5e4b60 100644 --- a/usr.bin/make/config.h +++ b/usr.bin/make/config.h @@ -114,4 +114,8 @@ # ifndef RANLIBMAG # define RANLIBMAG "__.SYMDEF" # endif +#else +# ifndef RANLIBMAG +# define RANLIBMAG "/" +# endif #endif |