From 9b844631a61b29f0152fcbb9984e4eb09d4dc50d Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 21 Jun 2018 14:28:20 +0000
Subject: [PATCH] Rename usr.bin/elfcopy to usr.bin/objcopy

We always install ELF Tool Chain's elfcopy as objcopy, so to avoid
confusion rename the src directory containing our reach-over Makefile
to match.

Requested by:	jhb
Sponsored by:	The FreeBSD Foundation
---
 Makefile.inc1                                | 6 +++---
 usr.bin/Makefile                             | 2 +-
 usr.bin/{elfcopy => objcopy}/Makefile        | 0
 usr.bin/{elfcopy => objcopy}/Makefile.depend | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename usr.bin/{elfcopy => objcopy}/Makefile (100%)
 rename usr.bin/{elfcopy => objcopy}/Makefile.depend (100%)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1a0f47d2ddb5..769441d20ec4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2182,7 +2182,7 @@ _binutils=	gnu/usr.bin/binutils
 .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 _elftctools=	lib/libelftc \
 		lib/libpe \
-		usr.bin/elfcopy \
+		usr.bin/objcopy \
 		usr.bin/nm \
 		usr.bin/size \
 		usr.bin/strings
@@ -2195,7 +2195,7 @@ _elftctools+=	usr.bin/addr2line
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \
 		lib/libpe \
-		usr.bin/elfcopy
+		usr.bin/objcopy
 .endif
 
 .if ${MK_CLANG_BOOTSTRAP} != "no"
@@ -2280,7 +2280,7 @@ NXBDIRS+= \
     usr.bin/cmp \
     usr.bin/diff \
     usr.bin/dirname \
-    usr.bin/elfcopy \
+    usr.bin/objcopy \
     usr.bin/env \
     usr.bin/fetch \
     usr.bin/find \
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index cb4f056134f0..f99fcdcf6367 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -264,7 +264,7 @@ SUBDIR.${MK_TOOLCHAIN}+=	c89
 SUBDIR.${MK_TOOLCHAIN}+=	c99
 SUBDIR.${MK_TOOLCHAIN}+=	ctags
 SUBDIR.${MK_TOOLCHAIN}+=	cxxfilt
-SUBDIR.${MK_TOOLCHAIN}+=	elfcopy
+SUBDIR.${MK_TOOLCHAIN}+=	objcopy
 SUBDIR.${MK_TOOLCHAIN}+=	file2c
 # ARM64TODO gprof does not build
 # RISCVTODO gprof does not build
diff --git a/usr.bin/elfcopy/Makefile b/usr.bin/objcopy/Makefile
similarity index 100%
rename from usr.bin/elfcopy/Makefile
rename to usr.bin/objcopy/Makefile
diff --git a/usr.bin/elfcopy/Makefile.depend b/usr.bin/objcopy/Makefile.depend
similarity index 100%
rename from usr.bin/elfcopy/Makefile.depend
rename to usr.bin/objcopy/Makefile.depend