summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-03-12 10:08:50 +0000
committerbde <bde@FreeBSD.org>1998-03-12 10:08:50 +0000
commitcd6b6787624bbf7d60238c3b630034034a9033eb (patch)
treea179794ee395b47cb0154e185f37f2d6359a445a
parent2f6ffebcd60aed05d5c850e68079eb6858dfe2ba (diff)
downloadFreeBSD-src-cd6b6787624bbf7d60238c3b630034034a9033eb.zip
FreeBSD-src-cd6b6787624bbf7d60238c3b630034034a9033eb.tar.gz
Separated header creation from header installation in libss. Create
the libss headers before installing them in `make world'.
-rw-r--r--Makefile4
-rw-r--r--lib/libss/Makefile10
2 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index fd1f342..07f091d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.158 1998/02/19 00:24:43 nate Exp $
+# $Id: Makefile,v 1.159 1998/02/19 07:34:46 jb Exp $
#
# While porting to the another architecture include the bootstrap instead
# of the normal build.
@@ -530,7 +530,7 @@ includes:
.endif
cd ${.CURDIR}/lib/libtermcap && ${MAKE} beforeinstall
cd ${.CURDIR}/lib/libcom_err && ${MAKE} beforeinstall
- cd ${.CURDIR}/lib/libss && ${MAKE} beforeinstall
+ cd ${.CURDIR}/lib/libss && ${MAKE} hdrs beforeinstall
cd ${.CURDIR}/lib/libscsi && ${MAKE} beforeinstall
cd ${.CURDIR}/lib/libutil && ${MAKE} beforeinstall
cd ${.CURDIR}/lib/libvgl && ${MAKE} beforeinstall
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index a5cc0b4..9016274 100644
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 1998/03/06 08:26:00 bde Exp $
+# $Id: Makefile,v 1.19 1998/03/06 13:44:12 bde Exp $
LIB= ss
SRCS= data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \
@@ -14,6 +14,8 @@ LIBDESTDIR= ${.CURDIR}/../libcom_err
DPADD= ${LIBDESTDIR}/libcom_err.a
LDADD= -L${LIBDESTDIR} -lcom_err
+hdrs: ss_err.h
+
.ORDER: ss_err.c ss_err.h
ss_err.c ss_err.h: ${.CURDIR}/ss_err.et
test -e ss_err.et || ln -s ${.CURDIR}/ss_err.et .
@@ -27,12 +29,8 @@ std_rqs.c: ${.CURDIR}/std_rqs.ct
beforeinstall:
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/ss.h \
- ${DESTDIR}/usr/include/ss
+ ss_err.h ${DESTDIR}/usr/include/ss
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/copyright.h \
${DESTDIR}/usr/include/ss/mit-sipb-copyright.h
-.if exists(${.OBJDIR}/ss_err.h)
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \
- ${DESTDIR}/usr/include/ss
-.endif
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud