Restore ImageMagick tar filename

diff --git a/configure b/configure
index 09e197fd69c4884fac897ea1b383eb01b7288d6d..97c6b71ebcafae11e771127ee41b7130bb63d785 100755 (executable)
--- a/configure
+++ b/configure
@@ -589,7 +589,7 @@ MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
-PACKAGE_TARNAME='ImageMagick.7'
+PACKAGE_TARNAME='ImageMagick'
 PACKAGE_VERSION='7.0.0-0'
 PACKAGE_STRING='ImageMagick 7.0.0-0'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
@@ -1857,7 +1857,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/ImageMagick.7]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/ImageMagick]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -4180,7 +4180,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='ImageMagick.7'
+ PACKAGE='ImageMagick'
  VERSION='7.0.0-0'
 
 
@@ -4379,7 +4379,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_GIT_REVISION=16930:a3b2030:20150916
+MAGICK_GIT_REVISION=16958:6e48959:20150919
 
 
 # Substitute library versioning

diff --git a/configure.ac b/configure.ac
index 2db7ba035517a7a68cfa1fff9756e6c6b1eb1991..ec45f252549e1f2fc873255d8a642b1a11c73214 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_define([magick_patchlevel_version], [0])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
 m4_define([magick_git_revision], esyscmd([sh -c "(gitversion .) | awk '{ print \$1 }' | tr -d '\n'"]))
-m4_define([magick_tar_name],[ImageMagick.magick_major_version])
+m4_define([magick_tar_name],[ImageMagick])
 
 # ==============================================================================
 # Initalize Automake