View | Details | Raw Unified | Return to bug 137483
Collapse All | Expand All

(-)src/Makefile.inc1 (-5 / +19 lines)
Lines 823-829 Link Here
823
#
823
#
824
doxygen:
824
doxygen:
825
	@if [ ! -x `/usr/bin/which doxygen` ]; then \
825
	@if [ ! -x `/usr/bin/which doxygen` ]; then \
826
		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
826
		doxymsg="You need doxygen (devel/doxygen) to generate the API documentation of the kernel." ; \
827
		if [ -x /usr/bin/fmt ]; then \
828
		echo  ${doxymsg} | /usr/bin/fmt; \
829
		else \
830
		echo ${doxymsg} ; \
831
		fi; \
827
		exit 1; \
832
		exit 1; \
828
	fi
833
	fi
829
	cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all
834
	cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all
Lines 1118-1131 Link Here
1118
_secure_lib_libcrypto= secure/lib/libcrypto
1123
_secure_lib_libcrypto= secure/lib/libcrypto
1119
_secure_lib_libssl= secure/lib/libssl
1124
_secure_lib_libssl= secure/lib/libssl
1120
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
1125
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
1121
.if ${MK_OPENSSH} != "no"
1122
_secure_lib_libssh= secure/lib/libssh
1123
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
1124
.if ${MK_KERBEROS} != "no"
1126
.if ${MK_KERBEROS} != "no"
1125
kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
1127
kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
1126
    kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
1128
    kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
1127
    lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
1129
    lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
1128
    lib/libcrypt__L
1130
    lib/libcrypt__L
1131
.endif
1132
.if ${MK_OPENSSH} != "no"
1133
_secure_lib_libssh= secure/lib/libssh
1134
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
1135
.if ${MK_KERBEROS_SUPPORT} != "no"
1129
secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
1136
secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
1130
.endif
1137
.endif
1131
.endif
1138
.endif
Lines 1145-1150 Link Here
1145
_kerberos5_lib_libroken= kerberos5/lib/libroken
1152
_kerberos5_lib_libroken= kerberos5/lib/libroken
1146
_kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
1153
_kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
1147
_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5
1154
_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5
1155
.endif
1156
1157
.if ${MK_GSSAPI} != "no"
1148
_lib_libgssapi=	lib/libgssapi
1158
_lib_libgssapi=	lib/libgssapi
1149
.endif
1159
.endif
1150
1160
Lines 1278-1284 Link Here
1278
1288
1279
delete-old-libs:
1289
delete-old-libs:
1280
	@echo ">>> Removing old libraries"
1290
	@echo ">>> Removing old libraries"
1281
	@echo "${OLD_LIBS_MESSAGE}" | fmt
1291
	@if [ -x /usr/bin/fmt ]; then \
1292
		echo "${OLD_LIBS_MESSAGE}" | /usr/bin/fmt; \
1293
	else \
1294
		echo "${OLD_LIBS_MESSAGE}" ; \
1295
	fi
1282
	@for file in ${OLD_LIBS}; do \
1296
	@for file in ${OLD_LIBS}; do \
1283
		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
1297
		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
1284
			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
1298
			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \

Return to bug 137483