svn commit: r244859 - in head/usr.sbin: . bsdinstall/partedit sade

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Dec 30 14:35:00 2012
New Revision: 244859
URL: http://svnweb.freebsd.org/changeset/base/244859

Log:
  Replace sade the extracted piece of sysinstall with sade the extracted
  piece of bsdinstall (although this time with a symlink instead of duplicated
  source code).
  
  Discussed on:	freebsd-geom
  MFC after:	3 months

Deleted:
  head/usr.sbin/sade/
Modified:
  head/usr.sbin/Makefile.amd64
  head/usr.sbin/Makefile.i386
  head/usr.sbin/Makefile.sparc64
  head/usr.sbin/bsdinstall/partedit/Makefile

Modified: head/usr.sbin/Makefile.amd64
==============================================================================
--- head/usr.sbin/Makefile.amd64	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/Makefile.amd64	Sun Dec 30 14:35:00 2012	(r244859)
@@ -23,7 +23,4 @@ SUBDIR+=	ndiscvt
 .endif
 SUBDIR+=	sicontrol
 SUBDIR+=	spkrtest
-.if ${MK_SYSINSTALL} != "no"
-SUBDIR+=	sade
-.endif
 SUBDIR+=	zzz

Modified: head/usr.sbin/Makefile.i386
==============================================================================
--- head/usr.sbin/Makefile.i386	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/Makefile.i386	Sun Dec 30 14:35:00 2012	(r244859)
@@ -17,9 +17,6 @@ SUBDIR+=	mptable
 SUBDIR+=	ndiscvt
 .endif
 SUBDIR+=	pnpinfo
-.if ${MK_SYSINSTALL} != "no"
-SUBDIR+=	sade
-.endif
 SUBDIR+=	sicontrol
 SUBDIR+=	spkrtest
 SUBDIR+=	zzz

Modified: head/usr.sbin/Makefile.sparc64
==============================================================================
--- head/usr.sbin/Makefile.sparc64	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/Makefile.sparc64	Sun Dec 30 14:35:00 2012	(r244859)
@@ -2,6 +2,3 @@
 
 SUBDIR+=	eeprom
 SUBDIR+=	ofwdump
-.if ${MK_SYSINSTALL} != "no"
-SUBDIR+=	sade
-.endif

Modified: head/usr.sbin/bsdinstall/partedit/Makefile
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/Makefile	Sun Dec 30 14:33:16 2012	(r244858)
+++ head/usr.sbin/bsdinstall/partedit/Makefile	Sun Dec 30 14:35:00 2012	(r244859)
@@ -2,7 +2,7 @@
 
 BINDIR= /usr/libexec/bsdinstall
 PROG=	partedit
-LINKS= ${BINDIR}/partedit ${BINDIR}/autopart
+LINKS= ${BINDIR}/partedit ${BINDIR}/autopart ${BINDIR}/partedit /usr/sbin/sade
 LDADD=	-lgeom -lncursesw -lutil -ldialog -lm
 
 PARTEDIT_ARCH= ${MACHINE}