11461 should use a native link-editor during the build
11463 SUNWonld has passed its use-by date
11464 cmd/sgs/tools should contain tools, not common code
11465 sgsmsg should be built with the rest of the build tools

@@ -87,24 +87,26 @@
 CTFMERGE_LIB =  :
 
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/cmd/sgs/Makefile.com
 
+SRCDIR =        $(SRC)/cmd/sgs/libconv
+
 CERRWARN        += -_gcc=-Wno-type-limits
 CERRWARN        += -_gcc=-Wno-switch
 
 # not linted
 SMATCH=off
 
 CTFCONVERT_O=
 
-README_REVISION=../../packages/common/readme_revision
-ONLDREADME=     ../../packages/common/SUNWonld-README
+README_REVISION= $(SGSHOME)/tools/readme_revision
+ONLDREADME=      $(SGSHOME)/tools/SUNWonld-README
 
 PICS=           $(OBJECTS:%=pics/%)
 
-CPPFLAGS +=     -I$(SRCBASE)/lib/libc/inc -I$(ELFCAP) \
+CPPFLAGS +=     -I$(SRC)/lib/libc/inc -I$(ELFCAP) \
                 -I$(SRC)/common/sgsrtcid
 
 ARFLAGS=        cr
 
 AS_CPPFLAGS=    -P -D_ASM $(CPPFLAGS)