PANKOVs restructure

*** 20,29 ****
--- 20,30 ----
  #
  
  #
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright (c) 2012 by Delphix. All rights reserved.
+ # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  #
  
  #
  # Makefile.master, global definitions for system source
  #
*** 143,154 ****
  CAT=            /usr/bin/cat
  ELFDUMP=        /usr/ccs/bin/elfdump
  M4=             /usr/ccs/bin/m4
  STRIP=          /usr/ccs/bin/strip
  LEX=            /usr/ccs/bin/lex
! FLEX=           $(SFW_ROOT)/bin/flex
  YACC=           /usr/ccs/bin/yacc
  CPP=            /usr/lib/cpp
  JAVAC=          $(JAVA_ROOT)/bin/javac
  JAVAH=          $(JAVA_ROOT)/bin/javah
  JAVADOC=        $(JAVA_ROOT)/bin/javadoc
  RMIC=           $(JAVA_ROOT)/bin/rmic
--- 144,156 ----
  CAT=            /usr/bin/cat
  ELFDUMP=        /usr/ccs/bin/elfdump
  M4=             /usr/ccs/bin/m4
  STRIP=          /usr/ccs/bin/strip
  LEX=            /usr/ccs/bin/lex
! FLEX=           /usr/bin/flex
  YACC=           /usr/ccs/bin/yacc
+ BISON=          /usr/bin/bison
  CPP=            /usr/lib/cpp
  JAVAC=          $(JAVA_ROOT)/bin/javac
  JAVAH=          $(JAVA_ROOT)/bin/javah
  JAVADOC=        $(JAVA_ROOT)/bin/javadoc
  RMIC=           $(JAVA_ROOT)/bin/rmic