From 1c32d751c7cb2abf26b1589f26c80558597e489b Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 4 Mar 2019 05:25:04 +0100 Subject: [PATCH] Remove mkinstalldirs, install-sh and missing These scripts are part of Automake [1] and are in current *nix build system not used anymore nor empty files need to be created. [1] https://www.gnu.org/software/automake/manual/html_node/Auxiliary-Programs.html --- .gitignore | 5 ----- build/build2.mk | 7 +------ scripts/phpize.in | 6 ++---- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 838c05b63a..885a08660e 100644 --- a/.gitignore +++ b/.gitignore @@ -81,11 +81,6 @@ Makefile Makefile.fragments Makefile.objects -# Generated by `./buildconf` or `cd ext/name && phpize` -install-sh -missing -mkinstalldirs - # RPM specification file generated by `./configure` /php7.spec diff --git a/build/build2.mk b/build/build2.mk index 94325e0168..79824cab8f 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -16,11 +16,9 @@ include generated_lists -TOUCH_FILES = mkinstalldirs install-sh missing - config_h_in = main/php_config.h.in -targets = $(TOUCH_FILES) configure $(config_h_in) +targets = configure $(config_h_in) PHP_AUTOCONF ?= 'autoconf' PHP_AUTOHEADER ?= 'autoheader' @@ -36,9 +34,6 @@ $(config_h_in): configure @rm -f $@ $(PHP_AUTOHEADER) $(SUPPRESS_WARNINGS) -$(TOUCH_FILES): - touch $(TOUCH_FILES) - aclocal.m4: configure.ac acinclude.m4 @echo rebuilding $@ cat acinclude.m4 ./build/libtool.m4 > $@ diff --git a/scripts/phpize.in b/scripts/phpize.in index 01366a3589..7db2386e6a 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -11,8 +11,8 @@ SED="@SED@" FILES_BUILD="shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh" FILES="acinclude.m4 Makefile.global run-tests*.php" -CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \ - mkinstalldirs missing config.nice configure configure.ac \ +CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \ + config.nice configure configure.ac \ aclocal.m4 config.h config.h.in conftest* libtool config.cache autom4te.cache/ \ config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \ run-tests*.php tests/*.diff tests/*.exp tests/*.log tests/*.out tests/*.php" @@ -196,8 +196,6 @@ case "$1" in phpize_replace_prefix - touch install-sh mkinstalldirs missing - phpize_check_shtool phpize_check_autotools -- 2.50.1