diff options
| author | wollman <wollman@FreeBSD.org> | 1995-01-23 18:56:40 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-01-23 18:56:40 +0000 |
| commit | 77c139fd98d96b4147ab01cad84f542b85ac01f3 (patch) | |
| tree | d06e08b3c2c2a9ca55d1c423a6ba2b5f0137e33a /lib/libss | |
| parent | dfe0c08e8639ff5e5b8d498bb38d2692e80e9c22 (diff) | |
| download | FreeBSD-src-77c139fd98d96b4147ab01cad84f542b85ac01f3.zip FreeBSD-src-77c139fd98d96b4147ab01cad84f542b85ac01f3.tar.gz | |
Make Jordan happy:
1) Link against object directory version of libcom_err.so.
2) Don't try to install ss_err.h if we haven't made it yet. It's not
on the critical path for `make world' at this point.
Diffstat (limited to 'lib/libss')
| -rw-r--r-- | lib/libss/Makefile | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/libss/Makefile b/lib/libss/Makefile index b82b54a..b75d326 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/01/19 22:28:35 wollman Exp $ +# $Id: Makefile,v 1.2 1995/01/21 23:30:31 wollman Exp $ LIB= ss SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ @@ -6,6 +6,11 @@ SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ std_rqs.c CFLAGS+= -I. -I${.CURDIR} -DPOSIX -DIN_LIBSS CLEANFILES+= ss ss_err.c ss_err.h std_rqs.c +.if exists(${.CURDIR}/../libcom_err/obj/.) +LDADD+= -L${.CURDIR}/../libcom_err/obj +.else +LDADD+= -L${.CURDIR}/../libcom_err +.endif LDADD+= -lcom_err ss_err.h ss_err.c: ss_err.et @@ -25,8 +30,14 @@ beforeinstall: ${DESTDIR}/usr/include/ss/mit-sipb-copyright.h || \ install -c -o ${BINOWN} -g ${BINGRP} -m 444 copyright.h \ ${DESTDIR}/usr/include/ss/mit-sipb-copyright.h - -cd ${.OBJDIR}; cmp -s ss_err.h ${DESTDIR}/usr/include/ss/ss_err.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \ - ${DESTDIR}/usr/include/ss + -cd ${.OBJDIR}; \ + if [ -f ss_err.h ]; then \ + cmp -s ss_err.h ${DESTDIR}/usr/include/ss/ss_err.h || \ + install -c -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \ + ${DESTDIR}/usr/include/ss; \ + else \ + true; \ + fi .include <bsd.lib.mk> + |
