[lmi-commits] [lmi] master 683b5daf 3/7: Deduplicate

[Greg Chicares]

branch: master
commit 683b5daf1619b06d21d811830c5a3f99eebc2b8a
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Deduplicate
    
    Long ago, the location of utilities as fundamental as 'cp' could vary
    for *nix-like environments on msw.
---
 configuration.make | 34 ++++++++++++++++++++++++++++++++++
 msw_cygwin.make    | 34 ----------------------------------
 msw_generic.make   | 34 ----------------------------------
 msw_wsl.make       | 34 ----------------------------------
 posix_fhs.make     | 28 ----------------------------
 5 files changed, 34 insertions(+), 130 deletions(-)

diff --git a/configuration.make b/configuration.make
index 8c526f30..8e59e33e 100644
--- a/configuration.make
+++ b/configuration.make
@@ -47,6 +47,40 @@ $(srcdir)/$(platform_makefile):: ;
 
 
################################################################################
 
+# Standard utilities.
+
+# Required in /bin (if anywhere) by FHS-2.2 .
+
+CHMOD   := chmod
+CP      := cp
+DATE    := date
+ECHO    := echo
+GZIP    := gzip
+INSTALL := install
+LS      := ls
+MKDIR   := mkdir
+MV      := mv
+RM      := rm
+SED     := sed
+TAR     := tar
+
+# FHS-2.2 would presumably put these in /usr/bin . However, debian
+# puts 'bzip2' and 'grep' in /bin .
+
+BSDTAR  := bsdtar
+BZIP2   := bzip2
+DIFF    := diff
+GREP    := grep
+MD5SUM  := md5sum
+PATCH   := patch
+SORT    := sort
+TOUCH   := touch
+TR      := tr
+WC      := wc
+WGET    := wget
+
+################################################################################
+
 # GNU tools for special purposes.
 
 # Always use the GNU C++ compiler and preprocessor, version 3.x or
diff --git a/msw_cygwin.make b/msw_cygwin.make
index fa4a1605..8c0c6262 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -82,40 +82,6 @@ compiler_runtime_files := \
   $(wildcard $(compiler_sysroot)/libgcc*.dll) \
   $(wildcard $(compiler_sysroot)/libstdc++*.dll) \
 
-################################################################################
-
-# Standard utilities.
-
-# Required in /bin (if anywhere) by FHS-2.2 .
-
-CHMOD   := chmod
-CP      := cp
-DATE    := date
-ECHO    := echo
-GZIP    := gzip
-INSTALL := install
-LS      := ls
-MKDIR   := mkdir
-MV      := mv
-RM      := rm
-SED     := sed
-TAR     := tar
-
-# FHS-2.2 would presumably put these in /usr/bin . However, debian
-# puts 'bzip2' and 'grep' in /bin .
-
-BSDTAR  := bsdtar
-BZIP2   := bzip2
-DIFF    := diff
-GREP    := grep
-MD5SUM  := md5sum
-PATCH   := patch
-SORT    := sort
-TOUCH   := touch
-TR      := tr
-WC      := wc
-WGET    := wget
-
 # Programs for which FHS doesn't specify a location.
 
 # Instead of requiring installation of the build system's own libxml2:
diff --git a/msw_generic.make b/msw_generic.make
index 17daa44d..2267eceb 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -62,40 +62,6 @@ compiler_runtime_files := \
   $(wildcard $(compiler_sysroot)/libgcc*.dll) \
   $(wildcard $(compiler_sysroot)/libstdc++*.dll) \
 
-################################################################################
-
-# Standard utilities.
-
-# Required in /bin (if anywhere) by FHS-2.2 .
-
-CHMOD   := chmod
-CP      := cp
-DATE    := date
-ECHO    := echo
-GZIP    := gzip
-INSTALL := install
-LS      := ls
-MKDIR   := mkdir
-MV      := mv
-RM      := rm
-SED     := sed
-TAR     := tar
-
-# FHS-2.2 would presumably put these in /usr/bin . However, debian
-# puts 'bzip2' and 'grep' in /bin .
-
-BSDTAR  := bsdtar
-BZIP2   := bzip2
-DIFF    := diff
-GREP    := grep
-MD5SUM  := md5sum
-PATCH   := patch
-SORT    := sort
-TOUCH   := touch
-TR      := tr
-WC      := wc
-WGET    := wget
-
 # Programs for which FHS doesn't specify a location.
 
 # Instead of requiring installation of the build system's own libxml2:
diff --git a/msw_wsl.make b/msw_wsl.make
index e7884b67..30dc5e0b 100644
--- a/msw_wsl.make
+++ b/msw_wsl.make
@@ -62,40 +62,6 @@ compiler_runtime_files := \
   $(wildcard $(compiler_sysroot)/libgcc*.dll) \
   $(wildcard $(compiler_sysroot)/libstdc++*.dll) \
 
-################################################################################
-
-# Standard utilities.
-
-# Required in /bin (if anywhere) by FHS-2.2 .
-
-CHMOD   := chmod
-CP      := cp
-DATE    := date
-ECHO    := echo
-GZIP    := gzip
-INSTALL := install
-LS      := ls
-MKDIR   := mkdir
-MV      := mv
-RM      := rm
-SED     := sed
-TAR     := tar
-
-# FHS-2.2 would presumably put these in /usr/bin . However, debian
-# puts 'bzip2' and 'grep' in /bin .
-
-BSDTAR  := bsdtar
-BZIP2   := bzip2
-DIFF    := diff
-GREP    := grep
-MD5SUM  := md5sum
-PATCH   := patch
-SORT    := sort
-TOUCH   := touch
-TR      := tr
-WC      := wc
-WGET    := wget
-
 # Programs for which FHS doesn't specify a location.
 
 # Instead of requiring installation of the build system's own libxml2:
diff --git a/posix_fhs.make b/posix_fhs.make
index 838e92cf..91621aeb 100644
--- a/posix_fhs.make
+++ b/posix_fhs.make
@@ -36,32 +36,4 @@ LD      := g++
 # that msw resources aren't used on this platform.
 RC      :=
 
-# Required in /bin (if anywhere) by FHS-2.2 .
-
-CHMOD   := chmod
-CP      := cp
-DATE    := date
-ECHO    := echo
-GZIP    := gzip
-INSTALL := install
-LS      := ls
-MKDIR   := mkdir
-MV      := mv
-RM      := rm
-SED     := sed
-TAR     := tar
-
-# FHS-2.2 would put these in /usr/bin .
-
-BSDTAR  := bsdtar
-BZIP2   := bzip2
-DIFF    := diff
-GREP    := grep
-MD5SUM  := md5sum
-PATCH   := patch
-SORT    := sort
-TOUCH   := touch
-TR      := tr
-WC      := wc
-WGET    := wget
 XMLLINT := xmllint