diff options
| author | csgr <csgr@FreeBSD.org> | 1994-08-12 21:02:31 +0000 |
|---|---|---|
| committer | csgr <csgr@FreeBSD.org> | 1994-08-12 21:02:31 +0000 |
| commit | 968abb74bcedeb106c222ba80453d070d9fd4b52 (patch) | |
| tree | 32298e204ed1e4396168bb326b565dfe5df7dfe1 /secure | |
| parent | 897503577778075f2e0f44c7f136d37bc0f0d56a (diff) | |
| download | FreeBSD-src-968abb74bcedeb106c222ba80453d070d9fd4b52.zip FreeBSD-src-968abb74bcedeb106c222ba80453d070d9fd4b52.tar.gz | |
1) don't make bdes yet
2) fix .include in secure/lib/Makefile.inc
3) fix afterinstall rule in libcrypt/Makefile
Submitted by: Geoff Rehmet
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/Makefile | 4 | ||||
| -rw-r--r-- | secure/lib/Makefile.inc | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypt/Makefile | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/secure/Makefile b/secure/Makefile index 1d4d253..9df15e1 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -1,6 +1,6 @@ -# $Id: Makefile,v 1.1 1994/08/07 19:04:08 wollman Exp $ +# $Id: Makefile,v 1.2 1994/08/08 17:49:22 csgr Exp $ -SUBDIR= bdes lib +SUBDIR= lib .include <bsd.subdir.mk> diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc index fbdf4c6..a03600e 100644 --- a/secure/lib/Makefile.inc +++ b/secure/lib/Makefile.inc @@ -1,3 +1,5 @@ -# $Id: Makefile.inc,v 1.1 1994/08/07 19:04:10 wollman Exp $ +# $Id: Makefile.inc,v 1.1 1994/08/08 17:42:36 csgr Exp $ -.include ${.CURDIR}/../../lib/Makefile.inc +.if exists(${.CURDIR}/../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../lib/Makefile.inc" +.endif diff --git a/secure/lib/libcrypt/Makefile b/secure/lib/libcrypt/Makefile index 009e779..a290fc3 100644 --- a/secure/lib/libcrypt/Makefile +++ b/secure/lib/libcrypt/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.3 1994/08/09 18:37:33 g89r4222 Exp $ +# $Id: Makefile,v 1.3 1994/08/09 18:52:52 csgr Exp $ # LCRYPTBASE= libcrypt @@ -27,10 +27,15 @@ test: # We only install the links if they do not already exist. # This may have to be revised afterinstall: +.if defined(SHLIB_MAJOR) && ! defined(NOSHARED) @if [ ! -e $(LCRYPTSO) ]; then \ cd $(DESTDIR)/$(LIBDIR); \ rm -f $(LCRYPTSO); \ ln -s $(LDCRYPTSO) $(LCRYPTSO); \ + fi +.endif + @if [ ! -e $(LCRYPTBASE).a ]; then \ + cd $(DESTDIR)/$(LIBDIR); \ rm -f $(LCRYPTBASE).a $(LCRYPTBASE)_p.a; \ ln -s $(LDCRYPTBASE).a libcrypt.a; \ ln -s $(LDCRYPTBASE)_p.a libcrypt_p.a; \ |
