--- ypserv-2.13/scripts/ypMakefile.in.nonedomain	2006-10-13 17:27:48.000000000 -0500
+++ ypserv-2.13/scripts/ypMakefile.in	2006-10-13 17:36:22.000000000 -0500
@@ -98,10 +98,18 @@ NETMASKS    = $(YPSRCDIR)/netmasks
 YPSERVERS = $(YPDIR)/ypservers	# List of all NIS servers for a domain
 
 target: Makefile
+ifeq    ($(shell /bin/domainname), (none))
+	@echo "Domain name cannot be (none)"
+else
+  ifeq ($(shell /bin/domainname), )
+	@echo "Domain name must be set"
+	else
 	@test ! -d $(LOCALDOMAIN) && mkdir $(LOCALDOMAIN) ; \
 	cd $(LOCALDOMAIN)  ; \
 	$(NOPUSH) || $(MAKE) -f ../Makefile ypservers; \
 	$(MAKE) -f ../Makefile all
+  endif
+endif
 
 # If you don't want some of these maps built, feel free to comment
 # them out from this list.