NEX-5200 native tools must reliably use a native adjunct
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

@@ -69,10 +69,12 @@
 # to local scope.
 MAPFILES +=     $(MAPFILE.LEX) $(MAPFILE.NGB)
 MAPOPTS =       $(MAPFILES:%=-M%)
 
 MYCPPFLAGS =    -I ../common -I$(ADJUNCT_PROTO)/usr/include/libxml2
+$(NATIVE_BUILD)MYCPPFLAGS =     -I ../common \
+                -I$(NATIVE_ADJUNCT)/usr/include/libxml2
 CPPFLAGS +=     $(MYCPPFLAGS)
 LDFLAGS +=      $(MAPOPTS)
 
 CERRWARN +=     -_gcc=-Wno-unused-label
 CERRWARN +=     -_gcc=-Wno-implicit-function-declaration

@@ -112,11 +114,11 @@
         -I$(LIBUUTIL)/common
 $(NATIVE_BUILD)LDFLAGS =
 $(NATIVE_BUILD)LDLIBS = \
         -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \
         -L$(LIBSCF)/native -R $(LIBSCF)/native \
-        -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
+        -L$(NATIVE_ADJUNCT)/usr/lib -R$(NATIVE_ADJUNCT)/usr/lib \
         $(SVCCFG_EXTRA_LIBS)
 
 svccfg_lex.o svccfg_grammar.o := CCVERBOSE =
 
 svccfg_help.po := XGETFLAGS =   -a