Merge with EOM 1.6

author: ho
Revert to manual OS selection.

author: ho
multiple OSes, sync with other Makefiles

author: ho
sysdep fixes, new def for OS variable

diff --git a/sbin/isakmpd/apps/certpatch/Makefile b/sbin/isakmpd/apps/certpatch/Makefile
index b1ca79c..725e982 100644 (file)
--- a/sbin/isakmpd/apps/certpatch/Makefile
+++ b/sbin/isakmpd/apps/certpatch/Makefile
@@ -1,5 +1,5 @@
-#      $OpenBSD: Makefile,v 1.2 1999/07/18 20:13:49 niklas Exp $
-#      $EOM: Makefile,v 1.3 1999/07/18 20:11:17 niklas Exp $
+#      $OpenBSD: Makefile,v 1.3 2000/04/07 22:06:36 niklas Exp $
+#      $EOM: Makefile,v 1.6 2000/03/28 21:22:06 ho Exp $
 
 #
 # Copyright (c) 1999 Niels Provos.  All rights reserved.
@@ -46,4 +46,8 @@ LDADD+=               -lcrypto
 DPADD+=                ${LIBCRYPTO}
 MAN=           certpatch.8
 
+.include "${TOPSRC}/sysdep/${OS}/Makefile.sysdep"
+# Override LIBSYSDEPDIR definition from Makefile.sysdep
+LIBSYSDEPDIR=  ${TOPSRC}/sysdep/common/libsysdep
+
 .include <bsd.prog.mk>