summaryrefslogtreecommitdiffstats
path: root/kerberos5/Makefile.inc
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2002-05-12 16:01:00 +0000
committerru <ru@FreeBSD.org>2002-05-12 16:01:00 +0000
commit59049318b65ea166adda623a5ac132b7502ae843 (patch)
tree57ff969855b4ca919ff4d533236ef90e163b1e76 /kerberos5/Makefile.inc
parentd47372f8ae9362037b3ca8651d6783b14df01e70 (diff)
downloadFreeBSD-src-59049318b65ea166adda623a5ac132b7502ae843.zip
FreeBSD-src-59049318b65ea166adda623a5ac132b7502ae843.tar.gz
Added new bsd.incs.mk which handles installing of header files
via INCS. Implemented INCSLINKS (equivalent to SYMLINKS) to handle symlinking include files. Allow for multiple groups of include files to be installed, with the powerful INCSGROUPS knob. Documentation to follow. Added standard `includes' and `incsinstall' targets, use them in Makefile.inc1. Headers from the following makefiles were not installed before (during `includes' in Makefile.inc1): kerberos5/lib/libtelnet/Makefile lib/libbz2/Makefile lib/libdevinfo/Makefile lib/libform/Makefile lib/libisc/Makefile lib/libmenu/Makefile lib/libmilter/Makefile lib/libpanel/Makefile Replaced all `beforeinstall' targets for installing includes with the INCS stuff. Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS, and for compatibility with NetBSD. Similarly for INCOWN, INCGRP, and INCMODE. Consistently use INCLUDEDIR instead of /usr/include. gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes were only lightly tested due to the missing contrib/libstdc++-v3. I fully tested the pre-WIP_GCC31 version of this patch with the contrib/libstdc++.295 stuff. These changes have been tested on i386 with the -DNO_WERROR "make world" and "make release".
Diffstat (limited to 'kerberos5/Makefile.inc')
-rw-r--r--kerberos5/Makefile.inc12
1 files changed, 1 insertions, 11 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 882c268..918b803 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -4,13 +4,12 @@ DISTRIBUTION?= krb5
.if !defined(INCLUDEOBJDIR)
-INCLUDEDIR= ${.CURDIR}/../../include
KRB4DIR= ${.CURDIR}/../../../crypto/kerberosIV
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal
ROKENDIR= ${.CURDIR}/../../lib/libroken
TELNETDIR= ${.CURDIR}/../../../crypto/telnet
-CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
+CFLAGS+=-Wall -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
.if defined(MAKE_KERBEROS4)
CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4
@@ -148,14 +147,6 @@ k524_err.c k524_err.h: \
CLEANFILES+=k524_err.h k524_err.c k524_err.et
-.if defined(INCLUDES)
-beforeinstall: ${INCLUDES}
-.for INC in ${INCLUDES}
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${INC} ${DESTDIR}/usr/include
-.endfor
-.endif
-
roken.h: make-roken
./make-roken > tmp.h ;\
if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
@@ -168,7 +159,6 @@ CLEANFILES+= make-roken.c make-roken roken.h
.else
-INCLUDEDIR= ${.CURDIR}/../../include
KRB4DIR= ${.CURDIR}/../../crypto/kerberosIV
KRB5DIR= ${.CURDIR}/../../crypto/heimdal
ROKENDIR= ${.CURDIR}/../../lib/libroken
OpenPOWER on IntegriCloud