From ac978a9c53cf2e6f32205b668f5aace9980b158b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= Date: Thu, 27 Apr 2017 01:51:57 +0200 Subject: [PATCH] kill off deprecated 'mkinstalldirs' 'mkinstalldirs' included in source tree and even installed into /usr/lib/rpm are simply a copy of 'mkinstalldirs' shipped with automake. 'automake --add-missing' no longer installs 'mkinstalldirs' as it's only a wrapper around 'mkdir -p', where 'install-sh -d' is now preferred when configure testing for 'mkdir -p' to work fails. --- Makefile.am | 3 +- configure.ac | 9 --- mkinstalldirs | 161 -------------------------------------------------- 3 files changed, 1 insertion(+), 172 deletions(-) delete mode 100755 mkinstalldirs diff --git a/Makefile.am b/Makefile.am index 154d3c6383..b25d08618d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,8 +99,7 @@ bin_PROGRAMS += rpm2archive endif rpmlibexec_PROGRAMS = -rpmconfig_SCRIPTS = mkinstalldirs \ - config.guess config.sub +rpmconfig_SCRIPTS = config.guess config.sub noinst_LTLIBRARIES = libcliutils.la libcliutils_la_SOURCES = cliutils.h cliutils.c diff --git a/configure.ac b/configure.ac index b41a4c9eaa..ec9951e6f3 100644 --- a/configure.ac +++ b/configure.ac @@ -153,15 +153,6 @@ AM_CONDITIONAL(HAVE_FAKECHROOT, [test "$__FAKECHROOT" != "no"]) dnl see if we have a mkdir that supports `-p' for rpmbuild's purposes AC_PROG_MKDIR_P -if ! echo $MKDIR_P | grep -q mkdir; then - __MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`" -else - __MKDIR_P=$MKDIR_P -fi -AC_DEFINE_UNQUOTED(__MKDIR_P, "${__MKDIR_P}", -[A full path to a program, possibly with arguments, that will create a - directory and all necessary parent directories, ala 'mkdir -p']) -AC_SUBST(__MKDIR_P) #================= # Check for zlib library. diff --git a/mkinstalldirs b/mkinstalldirs deleted file mode 100755 index ef7e16fdaf..0000000000 --- a/mkinstalldirs +++ /dev/null @@ -1,161 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2006-05-11.19 - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: