diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index f4732d93c..07d95369a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,7 +109,6 @@ TOP_EXTRA_DIST = \ NEWS.txt \ README.txt \ index.html \ - version.sh \ winpath.sh # Additional files to distribute @@ -283,7 +282,7 @@ magick-version: MagickCore/version.h fi ; \ touch magick-version -MagickCore/version.h: $(top_srcdir)/ChangeLog $(top_srcdir)/version.sh +MagickCore/version.h: $(top_srcdir)/ChangeLog $(top_srcdir)/m4/version.m4 # Automagically reconfigure libtool LIBTOOL_DEPS = @LIBTOOL_DEPS@ @@ -315,31 +314,31 @@ html-local: # Build Windows source Zip and 7Zip balls # if ZIP_DELEGATE -DIST_WINDOWS_SRC_ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.zip +DIST_WINDOWS_SRC_ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)-windows.zip else DIST_WINDOWS_SRC_ZIP= endif if P7ZIP_DELEGATE -DIST_WINDOWS_SRC_7ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.7z +DIST_WINDOWS_SRC_7ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)-windows.7z else DIST_WINDOWS_SRC_7ZIP= endif $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist: - if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; then \ - chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \ - rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \ + if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION) ; then \ + chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION) ; \ + rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION) ; \ fi - git clone -b master https://github.com/ImageMagick/ImageMagick.git $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) + git clone -b main https://github.com/ImageMagick/ImageMagick.git $(PACKAGE_NAME)-$(PACKAGE_VERSION) if ZIP_DELEGATE rm -f $(DIST_WINDOWS_SRC_ZIP) - $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) + $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION) endif # ZIP_DELEGATE if P7ZIP_DELEGATE rm -f $(DIST_WINDOWS_SRC_7ZIP) - $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) + $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION) chmod 644 $(DIST_WINDOWS_SRC_7ZIP) endif # P7ZIP_DELEGATE - rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) + rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION) # # RPM build support @@ -359,11 +358,11 @@ RPMDIR=rpmbuild RPMARCH=$(MAGICK_TARGET_CPU) DIST_ARCHIVE_RPM= \ - $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \ - $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \ - $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \ - $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \ - $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm + $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_PATCHLEVEL_VERSION).$(RPMARCH).rpm \ + $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)-$(PACKAGE_PATCHLEVEL_VERSION).$(RPMARCH).rpm \ + $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)-$(PACKAGE_PATCHLEVEL_VERSION).$(RPMARCH).rpm \ + $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)-$(PACKAGE_PATCHLEVEL_VERSION).$(RPMARCH).rpm \ + $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)-$(PACKAGE_PATCHLEVEL_VERSION).$(RPMARCH).rpm .PHONY: rpm rpm: dist |