svn commit: r325633 - in head: rescue/rescue tools/bsdbox

[Bryan Drewery]

Author: bdrewery
Date: Fri Nov 10 07:53:02 2017
New Revision: 325633
URL: https://svnweb.freebsd.org/changeset/base/325633

Log:
  Avoid referencing private lib names directly.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/rescue/rescue/Makefile
  head/tools/bsdbox/Makefile

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Fri Nov 10 07:52:58 2017	(r325632)
+++ head/rescue/rescue/Makefile	Fri Nov 10 07:53:02 2017	(r325633)
@@ -193,7 +193,7 @@ CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat
 
 CRUNCH_PROGS_usr.bin+= zstd
 CRUNCH_ALIAS_zstd= unzstd zstdcat zstdmt
-CRUNCH_LIBS+=	-lprivatezstd
+CRUNCH_LIBS+=	${LDADD_zstd}
 
 CRUNCH_PROGS_usr.bin+= tar
 CRUNCH_LIBS+= -larchive

Modified: head/tools/bsdbox/Makefile
==============================================================================
--- head/tools/bsdbox/Makefile	Fri Nov 10 07:52:58 2017	(r325632)
+++ head/tools/bsdbox/Makefile	Fri Nov 10 07:53:02 2017	(r325633)
@@ -72,7 +72,7 @@ CRUNCH_SRCDIRS+= sbin
 
 CRUNCH_LIBS+= -l80211 -lalias -lcam -lcursesw -ldevstat -lipsec
 # Don't forget this - ifconfig, etc -adrian
-CRUNCH_LIBS+= -lprivateifconfig
+CRUNCH_LIBS+= ${LDADD_ifconfig}
 CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs
 
 ##################################################################