4 files changed, 7 insertions, 19 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 9c2ae475c9..e08cd2755d 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -357,6 +357,7 @@ MSGSUBDIRS=		\
 	madv		\
 	mpss		\
 	pam_modules	\
+	pyzfs		\
 	rpcsec_gss	\
 	$($(MACH)_MSGSUBDIRS)
 
diff --git a/usr/src/lib/libbc/inc/include/sys/fcntlcom.h b/usr/src/lib/libbc/inc/include/sys/fcntlcom.h
index 8a843c900f..8caf65e2a3 100644
--- a/usr/src/lib/libbc/inc/include/sys/fcntlcom.h
+++ b/usr/src/lib/libbc/inc/include/sys/fcntlcom.h
@@ -20,6 +20,7 @@
  */
 
 /*
+ * Copyright 2016 Gary Mills
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -134,6 +135,10 @@ extern "C" {
 #define	F_CNVT 		12	/* Convert a fhandle to an open fd */
 #endif	/* !_POSIX_SOURCE */
 
+/* Needed by flock.c */
+#define	F_FLOCKW	F_SETLKW
+#define	F_FLOCK		F_SETLK
+
 /* fcntl(2) flags (l_type field of flock structure) */
 #define	F_RDLCK		1	/* read lock */
 #define	F_WRLCK		2	/* write lock */
diff --git a/usr/src/lib/pysolaris/Makefile b/usr/src/lib/pysolaris/Makefile
index 7c018260b7..df3d21faa4 100644
--- a/usr/src/lib/pysolaris/Makefile
+++ b/usr/src/lib/pysolaris/Makefile
@@ -26,8 +26,6 @@
 include	../Makefile.lib
 
 SUBDIRS=	$(MACH)
-XGETTEXT=	$(GNUXGETTEXT)
-XGETFLAGS=	$(GNUXGETFLAGS)
 
 all :=		TARGET= all
 install :=	TARGET= install
@@ -35,21 +33,14 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 lint :=		TARGET= lint
 
-MSGFIND =	$(FIND) . -name '*.py' -o -name '*.c'
-MSGFILES =	$(MSGFIND:sh)
 PYCFIND =	$(FIND) . -name '*.pyc'
 PYCFILES = 	$(PYCFIND:sh)
-POFILE =	pysolaris.po
 
 .KEEP_STATE:
 
 all install clean lint: $(SUBDIRS)
 clobber: $(SUBDIRS)
-	$(RM) $(POFILE) $(PYCFILES)
-
-$(POFILE):	pofile_MSGFILES
-
-_msg: $(MSGDOMAINPOFILE)
+	$(RM) $(PYCFILES)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pysolaris/common/misc.c b/usr/src/lib/pysolaris/common/misc.c
index da7bb0075f..13280d461f 100644
--- a/usr/src/lib/pysolaris/common/misc.c
+++ b/usr/src/lib/pysolaris/common/misc.c
@@ -29,12 +29,6 @@
 #include <idmap.h>
 #include <directory.h>
 
-#ifdef __lint
-#define	dgettext(x, y) y
-#endif
-
-#define	_(s) dgettext(TEXT_DOMAIN, s)
-
 extern int sid_to_id(char *sid, boolean_t user, uid_t *id);
 
 static PyObject *
@@ -130,8 +124,5 @@ static PyMethodDef solarismethods[] = {
 void
 initmisc(void)
 {
-	char *noop;
-
-	noop = _("noop");
 	PyObject *solaris_misc = Py_InitModule("solaris.misc", solarismethods);
 }