195 Need replacement for nfs/lockd+klm
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Jeremy Jones <jeremy@delphix.com>
Reviewed by: Jeff Biseda <jbiseda@delphix.com>

@@ -32,11 +32,13 @@
 include $(SRC)/Makefile.master
 
 SUBDIR1=        exportfs nfsd rquotad \
                 statd nfsstat mountd dfshares \
                 nfsfind nfs4cbd share
-SUBDIR2=        clear_locks umount showmount \
+
+# These do "make catalog"
+SUBDIR2=        clear_locks lockd umount showmount \
                 mount dfmounts nfslog nfsmapid \
                 nfsref rp_basic
 
 SUBDIR3=        etc svc
 SUBDIRS=        $(SUBDIR1) $(SUBDIR2) $(SUBDIR3)

@@ -44,15 +46,10 @@
 # for messaging catalog files
 #
 POFILES=        $(SUBDIR2:%=%/%.po)
 POFILE=         nfs.po
 
-LOCKD=          $(CLOSED)/cmd/fs.d/nfs/lockd
-$(CLOSED_BUILD)CLOSED_SUBDIR2=  $(LOCKD)
-$(CLOSED_BUILD)POFILES +=       $(LOCKD)/lockd.po
-$(CLOSED_BUILD)SUBDIRS +=       $(CLOSED_SUBDIR2)
-
 all:=           TARGET= all
 install:=       TARGET= install
 clean:=         TARGET= clean
 clobber:=       TARGET= clobber
 lint:=          TARGET= lint

@@ -62,11 +59,11 @@
 
 .PARALLEL:      $(SUBDIRS)
 
 all install clean clobber lint: $(SUBDIRS)
 
-catalog: $(SUBDIR2) $(CLOSED_SUBDIR2)
+catalog: $(SUBDIR2)
         $(RM) $(POFILE)
         cat $(POFILES) > $(POFILE)
 
 $(SUBDIRS): FRC
         @cd $@; pwd; $(MAKE) $(TARGET)