[Midnightbsd-cvs] src [10645] trunk/lib: fix path

[laffer1 at midnightbsd.org]

Revision: 10645
          http://svnweb.midnightbsd.org/src/?rev=10645
Author:   laffer1
Date:     2018-06-09 12:52:43 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
fix path

Modified Paths:
--------------
    trunk/lib/libsm/Makefile
    trunk/lib/libsmb/Makefile
    trunk/lib/libsmdb/Makefile

Modified: trunk/lib/libsm/Makefile
===================================================================
--- trunk/lib/libsm/Makefile	2018-06-09 16:52:11 UTC (rev 10644)
+++ trunk/lib/libsm/Makefile	2018-06-09 16:52:43 UTC (rev 10645)
@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libsm/Makefile,v 1.12 2007/04/09 01:45:30 gshapiro Exp $
 # $MidnightBSD$
+# $FreeBSD: stable/10/lib/libsm/Makefile 313608 2017-02-11 06:40:27Z ngie $
 
 .include <bsd.own.mk>
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsm
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
@@ -30,7 +30,7 @@
 	smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c \
 	vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c \
 	wbuf.c wsetup.c string.c stringf.c \
-	xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c \
+	xtrap.c strto.c test.c strcasecmp.c strrevcmp.c \
 	signal.c clock.c config.c sem.c shm.c mbdb.c strexit.c cf.c ldap.c \
 	niprop.c mpeix.c memstat.c util.c inet6_ntop.c
 CLEANFILES+=sm_os.h

Modified: trunk/lib/libsmb/Makefile
===================================================================
--- trunk/lib/libsmb/Makefile	2018-06-09 16:52:11 UTC (rev 10644)
+++ trunk/lib/libsmb/Makefile	2018-06-09 16:52:43 UTC (rev 10645)
@@ -1,10 +1,13 @@
-# $FreeBSD: src/lib/libsmb/Makefile,v 1.11 2007/05/21 02:49:06 deischen Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libsmb/Makefile 313606 2017-02-11 06:39:04Z ngie $
 
-CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
+.include <bsd.own.mk>
+
+CONTRIBDIR=	${SRCTOP}/contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
 
 LIB=	smb
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 DPADD=	${LIBKICONV}
 LDADD=	-lkiconv
 
@@ -16,4 +19,8 @@
 WARNS?=	1
 CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include
 
+.if ${MK_ICONV} != "no"
+CFLAGS+= -DHAVE_ICONV=1
+.endif
+
 .include <bsd.lib.mk>

Modified: trunk/lib/libsmdb/Makefile
===================================================================
--- trunk/lib/libsmdb/Makefile	2018-06-09 16:52:11 UTC (rev 10644)
+++ trunk/lib/libsmdb/Makefile	2018-06-09 16:52:43 UTC (rev 10645)
@@ -1,6 +1,7 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/lib/libsmdb/Makefile 313607 2017-02-11 06:39:47Z ngie $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmdb
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.