...

diff --git a/Makefile.am b/Makefile.am
index a19a2ffb52ba56a8be89d339fb8ca1c786593cdb..461dc658e0b907cab3d0a74235a196d9415a4d8a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -369,11 +369,12 @@ DIST_ARCHIVE_RPM= \
 
 .PHONY: rpm
 rpm:   dist
+       rm -rf $(RPMDIR)
        $(MKDIR_P) $(RPMDIR)
        $(MKDIR_P) $(RPMDIR)/BUILD
        $(MKDIR_P) $(RPMDIR)/RPMS
        $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
-       rm -rf $(RPMDIR)
+       rm -rf rpmbuild
        @echo ==============================================================
        @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
        @echo ==============================================================

diff --git a/Makefile.in b/Makefile.in
index c42cb5cbaf351e53041e8b089b3910434d05403d..dde56428abc06a33084f823128fb1c7a990eb0fe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11836,11 +11836,12 @@ $(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@    $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
-@RPM_DELEGATE_TRUE@    rm -rf $(RPMDIR)
+@RPM_DELEGATE_TRUE@    rm -rf rpmbuild
 @RPM_DELEGATE_TRUE@    @echo ==============================================================
 @RPM_DELEGATE_TRUE@    @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
 @RPM_DELEGATE_TRUE@    @echo ==============================================================

diff --git a/configure b/configure
index 72d1aa86e8c755831e2c512c20e9ec1f3a668e3b..a22445979877d4060567cb4aa37f0347f716f0ab 100755 (executable)
--- a/configure
+++ b/configure
@@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=24
 
 MAGICK_VERSION=7.0.7-24
 
-MAGICK_GIT_REVISION=23033:57c3b50bd:20180223
+MAGICK_GIT_REVISION=23034:c3df32ec5:20180223
 
 
 # Substitute library versioning