summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libisc/Makefile2
-rw-r--r--lib/libmilter/Makefile2
-rw-r--r--lib/libmp/Makefile4
-rw-r--r--lib/libncurses/Makefile19
-rw-r--r--lib/libpam/libpam/Makefile13
-rw-r--r--lib/libpcap/Makefile7
-rw-r--r--lib/libstand/Makefile5
-rw-r--r--lib/libwrap/Makefile6
-rw-r--r--lib/msun/Makefile7
-rw-r--r--lib/ncurses/ncurses/Makefile19
10 files changed, 22 insertions, 62 deletions
diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile
index 9423563..3733343 100644
--- a/lib/libisc/Makefile
+++ b/lib/libisc/Makefile
@@ -27,7 +27,7 @@ INCS= ${BIND_DIR}/include/isc/assertions.h \
${BIND_DIR}/include/isc/memcluster.h \
${BIND_DIR}/include/isc/misc.h \
${BIND_DIR}/include/isc/tree.h
-INCDIR= /usr/include/isc
+INCSDIR= ${INCLUDEDIR}/isc
MAN= assertions.3 bitncmp.3 eventlib.3 heap.3 \
logging.3 memcluster.3 tree.3
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index b3444e5..371933e 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -12,7 +12,7 @@ CFLAGS+=-D_THREAD_SAFE
# User customizations to the sendmail build environment
CFLAGS+=${SENDMAIL_CFLAGS}
-INCDIR= /usr/include/libmilter
+INCSDIR=${INCLUDEDIR}/libmilter
INCS= ${SENDMAIL_DIR}/include/libmilter/mfapi.h \
${SENDMAIL_DIR}/include/libmilter/mfdef.h
LIB= milter
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index 76bdd8f..a6381f3 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -10,8 +10,4 @@ SRCS= mpasbn.c
INCS= mp.h
MAN3= libmp.3
-beforeinstall:
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${.CURDIR}/mp.h ${DESTDIR}/usr/include
-
.include <bsd.lib.mk>
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index f73af6c..0bad7af 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -34,8 +34,8 @@ ONEUL= 1UL
.PATH: ${NCURSES}/include
.PATH: ${NCURSES}/man
-INCS= -I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include
-CFLAGS+=${INCS} -Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS
+CFLAGS+=-I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include
+CFLAGS+=-Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS
GENSRC= \
codes.c \
@@ -60,6 +60,8 @@ GENHDR= \
# Installed
HEADERS=curses.h term.h termcap.h unctrl.h
SRCHDRS=ncurses_dll.h
+INCS= ${HEADERS} ${SRCHDRS}
+INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h
# Components of names.c and codes.c
NAMESRC=boolnames boolfnames numnames numfnames strnames strfnames
@@ -251,15 +253,6 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a
DOCSDIR= /usr/share/doc/ncurses
DOCS= ncurses-intro.html hackguide.html
-beforeinstall: ${HEADERS}
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${HEADERS} \
- ${DESTDIR}/usr/include
- cd ${NCURSES}/include ; \
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SRCHDRS} \
- ${DESTDIR}/usr/include
- rm -f ${DESTDIR}/usr/include/ncurses.h
- ln -s curses.h ${DESTDIR}/usr/include/ncurses.h
-
.if !defined(NOHTML)
afterinstall:
.for file in ${DOCS}
@@ -282,7 +275,7 @@ codes.c: namehdr ${CODESRC} codeftr
cat namehdr ${CODESRC} codeftr > $@
lib_gen.c: MKlib_gen.sh curses.h
- sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
+ sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
"${AWK}" < curses.h >$@
lib_keyname.c: keys.list MKkeyname.awk
@@ -308,7 +301,7 @@ ncurses_def.h: MKncurses_def.sh ncurses_defs
${NCURSES}/include/ncurses_defs > ncurses_def.h
nomacros.h: MKlib_gen.sh curses.h
- sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
+ sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
"${AWK}" < curses.h | fgrep undef > $@
init_keytry.h: keys.list make_keys
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index e8118ad..5c0750e 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -135,7 +135,7 @@ HEADERS += security/pam_constants.h
HEADERS += security/pam_modules.h
HEADERS += security/pam_types.h
-ADD_HEADERS = pam_mod_misc.h
+ADD_HEADERS = security/pam_mod_misc.h
# Static modules
MODULE_DIR = ../modules
@@ -154,15 +154,8 @@ openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
.endif
# Headers
-beforeinstall:
-.for HEADER in ${HEADERS}
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${OPENPAM}/include/${HEADER} ${DESTDIR}/usr/include/${HEADER}
-.endfor
-.for HEADER in ${ADD_HEADERS}
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${.CURDIR}/security/${HEADER} ${DESTDIR}/usr/include/security/${HEADER}
-.endfor
+INCS= ${HEADERS} ${ADD_HEADERS}
+INCSDIR= ${INCLUDEDIR}/security
.include <bsd.lib.mk>
.PATH: ${OPENPAM}/include
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index a2c9be6..b87bb9b 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -6,6 +6,7 @@ SRCS= grammar.y tokdefs.h pcap-bpf.c \
pcap.c inet.c gencode.c optimize.c nametoaddr.c \
etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \
scanner.l version.c
+INCS= pcap.h pcap-int.h pcap-namedb.h
MAN= pcap.3
CLEANFILES=tokdefs.h version.c
@@ -29,12 +30,6 @@ version.c: ${PCAP_DISTDIR}/VERSION
@rm -f $@
sed 's/.*/char pcap_version[] = "&";/' ${PCAP_DISTDIR}/VERSION > $@
-beforeinstall:
-.for i in pcap.h pcap-int.h pcap-namedb.h
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${PCAP_DISTDIR}/$i \
- ${DESTDIR}/usr/include
-.endfor
-
tokdefs.h: grammar.h
ln -sf grammar.h tokdefs.h
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 55b71b9..38c0312 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -9,6 +9,7 @@
LIB= stand
NOPROFILE= YES
NOPIC= YES
+INCS= stand.h
MAN= libstand.3
CFLAGS+= -ffreestanding
@@ -151,8 +152,4 @@ SRCS+= netif.c nfs.c
SRCS+= dosfs.c ext2fs.c
SRCS+= splitfs.c
-beforeinstall:
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/stand.h \
- ${DESTDIR}/usr/include
-
.include <bsd.lib.mk>
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index e1af867..8304710 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -7,6 +7,7 @@ MAINTAINER=markm@FreeBSD.org
LIB= wrap
SHLIB_MAJOR= 3
SHLIB_MINOR= 0
+INCS= tcpd.h
MAN= hosts_access.3
MAN+= hosts_access.5 hosts_options.5
@@ -26,9 +27,4 @@ SRCS= clean_exit.c diag.c eval.c fix_options.c fromhost.c \
percent_m.c percent_x.c refuse.c rfc931.c shell_cmd.c \
socket.c tli.c update.c workarounds.c libvars.c
-beforeinstall:
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${.CURDIR}/../../contrib/tcp_wrappers/tcpd.h \
- ${DESTDIR}/usr/include
-
.include <bsd.lib.mk>
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index b7c5184..1fb2169 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -117,6 +117,8 @@ ${ARCH_PREFIX}${i}: ${.CURDIR}/${ARCH}/${i}
cp ${.ALLSRC} ${.TARGET}
.endfor
+INCS= math.h
+
MAN= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \
cos.3 cosh.3 erf.3 exp.3 fabs.3 floor.3 fmod.3 hypot.3 ieee.3 \
ieee_test.3 j0.3 lgamma.3 math.3 rint.3 sin.3 sinh.3 sqrt.3 \
@@ -157,9 +159,4 @@ MLINKS+=sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 sqrtf.3
MLINKS+=tan.3 tanf.3
MLINKS+=tanh.3 tanhf.3
-# XXX we should have only one math.h, and a rule for installing .h's...
-beforeinstall:
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/src/math.h \
- ${DESTDIR}/usr/include
-
.include <bsd.lib.mk>
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index f73af6c..0bad7af 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -34,8 +34,8 @@ ONEUL= 1UL
.PATH: ${NCURSES}/include
.PATH: ${NCURSES}/man
-INCS= -I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include
-CFLAGS+=${INCS} -Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS
+CFLAGS+=-I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include
+CFLAGS+=-Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS
GENSRC= \
codes.c \
@@ -60,6 +60,8 @@ GENHDR= \
# Installed
HEADERS=curses.h term.h termcap.h unctrl.h
SRCHDRS=ncurses_dll.h
+INCS= ${HEADERS} ${SRCHDRS}
+INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h
# Components of names.c and codes.c
NAMESRC=boolnames boolfnames numnames numfnames strnames strfnames
@@ -251,15 +253,6 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a
DOCSDIR= /usr/share/doc/ncurses
DOCS= ncurses-intro.html hackguide.html
-beforeinstall: ${HEADERS}
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${HEADERS} \
- ${DESTDIR}/usr/include
- cd ${NCURSES}/include ; \
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SRCHDRS} \
- ${DESTDIR}/usr/include
- rm -f ${DESTDIR}/usr/include/ncurses.h
- ln -s curses.h ${DESTDIR}/usr/include/ncurses.h
-
.if !defined(NOHTML)
afterinstall:
.for file in ${DOCS}
@@ -282,7 +275,7 @@ codes.c: namehdr ${CODESRC} codeftr
cat namehdr ${CODESRC} codeftr > $@
lib_gen.c: MKlib_gen.sh curses.h
- sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
+ sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
"${AWK}" < curses.h >$@
lib_keyname.c: keys.list MKkeyname.awk
@@ -308,7 +301,7 @@ ncurses_def.h: MKncurses_def.sh ncurses_defs
${NCURSES}/include/ncurses_defs > ncurses_def.h
nomacros.h: MKlib_gen.sh curses.h
- sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
+ sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
"${AWK}" < curses.h | fgrep undef > $@
init_keytry.h: keys.list make_keys
OpenPOWER on IntegriCloud