From e7b99c369adea1d4fa9e4b61599eac36b5825d6d Mon Sep 17 00:00:00 2001 From: Cristy Date: Thu, 16 May 2019 08:48:03 -0400 Subject: [PATCH] ... --- Makefile.am | 10 +++++----- Makefile.in | 12 ++++++------ configure | 2 +- utilities/Makefile.am | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0916a5dcd..918f1a41c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -298,7 +298,7 @@ libtool: $(LIBTOOL_DEPS) html-local: # copy static file for dir in $(DOCDIRSMANUAL) ; do \ - $(MKDIR_P) $(top_builddir)/$$dir ;\ + $(mkinstalldirs) $(top_builddir)/$$dir ;\ for file in $$dir/*.* ; do \ if ! test -f $(top_builddir)/$$file; then \ cp -p -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \ @@ -310,7 +310,7 @@ html-local: rm -rf $$dir || true; \ done; # make doxygen doc - $(MKDIR_P) $(top_builddir)/www/api + $(mkinstalldirs) $(top_builddir)/www/api cd config && doxygen MagickCore.dox cd config && doxygen MagickWand.dox cd config && doxygen Magick++.dox @@ -372,9 +372,9 @@ DIST_ARCHIVE_RPM= \ .PHONY: rpm rpm: dist rm -rf $(RPMDIR) - $(MKDIR_P) $(RPMDIR) - $(MKDIR_P) $(RPMDIR)/BUILD - $(MKDIR_P) $(RPMDIR)/RPMS + $(mkinstalldirs) $(RPMDIR) + $(mkinstalldirs) $(RPMDIR)/BUILD + $(mkinstalldirs) $(RPMDIR)/RPMS $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec @echo ============================================================== @echo $(DIST_ARCHIVE_RPM) is ready for distribution. diff --git a/Makefile.in b/Makefile.in index 5687334b5..26a047a4a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13023,7 +13023,7 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile install-exec-local-utilities: - $(MKDIR_P) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) cd $(DESTDIR)$(bindir) ; \ magick=`echo "magick" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ for name in $(MAGICK_UTILITIES) ; \ @@ -13224,7 +13224,7 @@ libtool: $(LIBTOOL_DEPS) html-local: # copy static file for dir in $(DOCDIRSMANUAL) ; do \ - $(MKDIR_P) $(top_builddir)/$$dir ;\ + $(mkinstalldirs) $(top_builddir)/$$dir ;\ for file in $$dir/*.* ; do \ if ! test -f $(top_builddir)/$$file; then \ cp -p -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \ @@ -13236,7 +13236,7 @@ html-local: rm -rf $$dir || true; \ done; # make doxygen doc - $(MKDIR_P) $(top_builddir)/www/api + $(mkinstalldirs) $(top_builddir)/www/api cd config && doxygen MagickCore.dox cd config && doxygen MagickWand.dox cd config && doxygen Magick++.dox @@ -13263,9 +13263,9 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist: @RPM_DELEGATE_TRUE@.PHONY: rpm @RPM_DELEGATE_TRUE@rpm: dist @RPM_DELEGATE_TRUE@ rm -rf $(RPMDIR) -@RPM_DELEGATE_TRUE@ $(MKDIR_P) $(RPMDIR) -@RPM_DELEGATE_TRUE@ $(MKDIR_P) $(RPMDIR)/BUILD -@RPM_DELEGATE_TRUE@ $(MKDIR_P) $(RPMDIR)/RPMS +@RPM_DELEGATE_TRUE@ $(mkinstalldirs) $(RPMDIR) +@RPM_DELEGATE_TRUE@ $(mkinstalldirs) $(RPMDIR)/BUILD +@RPM_DELEGATE_TRUE@ $(mkinstalldirs) $(RPMDIR)/RPMS @RPM_DELEGATE_TRUE@ $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec @RPM_DELEGATE_TRUE@ @echo ============================================================== @RPM_DELEGATE_TRUE@ @echo $(DIST_ARCHIVE_RPM) is ready for distribution. diff --git a/configure b/configure index 46b40ba8a..aaf144ef5 100755 --- a/configure +++ b/configure @@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=46 MAGICK_VERSION=7.0.8-46 -MAGICK_GIT_REVISION=15645:b016c8473:20190516 +MAGICK_GIT_REVISION=15646:ea9a1d34f:20190516 # Substitute library versioning diff --git a/utilities/Makefile.am b/utilities/Makefile.am index 53b5593b1..9f8ad3549 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -78,7 +78,7 @@ endif UTILITIES_INSTALL_EXEC_LOCAL_TARGETS=install-exec-local-utilities install-exec-local-utilities: - $(MKDIR_P) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) cd $(DESTDIR)$(bindir) ; \ magick=`echo "magick" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ for name in $(MAGICK_UTILITIES) ; \ -- 2.40.0