(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 3e69f414e8a3da3f87ff3ea6f8bb660fcc7056c0..8eab9b16741fc70b9aee0a8fbca8564919cb50fc 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -493,15 +493,3 @@ MAGICKCORE_EXTRA_DIST = \
        MagickCore/nt-feature.c \
        MagickCore/vms.c \
        MagickCore/xwdfile.h_vms 
-
-# Install magick-baseconfig.h
-MAGICKCORE_INSTALL_DATA_LOCAL_TARGETS = MagickCore-install-data-local
-MagickCore-install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
-       $(INSTALL_HEADER) MagickCore/magick-baseconfig.h $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
-
-# Uninstall magick-config.h
-MAGICKCORE_UNINSTALL_LOCAL_TARGETS = MagickCore-uninstall-local
-MagickCore-uninstall-local:
-       rm -f $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
-

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 4a4957a6ebecf05c222e784720df1d0fb40ad535..2b5c25864dff8cb8e68d80b9f568f2913714e02f 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "15814:15816M"
+#define MagickSVNRevision  "15896M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-05-20"
+#define MagickReleaseDate  "2014-05-27"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/Makefile.am b/Makefile.am
index 5cafc508c5206f3e99bea972c2ff26f9d11bf541..cea8823a56a1f87aa3f42ac86339bffb442ed635 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,14 +186,9 @@ all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINE
 install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) \
        $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
 
-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-       $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-       $(HTML_INSTALL_DATA_TARGETS)
-
-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
-       $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \
-       $(HTML_UNINSTALL_DATA_TARGETS) \
-       $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
+install-data-local: $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS)
+
+uninstall-local: $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS) $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
 
 clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
 

diff --git a/Makefile.in b/Makefile.in
index df03ec7e6fd40f3cbe58dad69e4d5e4128c2a2ee..963f55eae0db64cac6caab408d013265728e261d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4564,12 +4564,6 @@ MAGICKCORE_EXTRA_DIST = \
        MagickCore/vms.c \
        MagickCore/xwdfile.h_vms 
 
-
-# Install magick-baseconfig.h
-MAGICKCORE_INSTALL_DATA_LOCAL_TARGETS = MagickCore-install-data-local
-
-# Uninstall magick-config.h
-MAGICKCORE_UNINSTALL_LOCAL_TARGETS = MagickCore-uninstall-local
 MagickWandincdir = $(INCLUDE_PATH)/MagickWand
 MAGICKWAND_CPPFLAGS = $(AM_CPPFLAGS)
 MAGICKWAND_SOURCES = \
@@ -11509,11 +11503,6 @@ uninstall-man: uninstall-man1
        uninstall-magickpptopincHEADERS uninstall-man uninstall-man1 \
        uninstall-pkgconfigDATA
 
-MagickCore-install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
-       $(INSTALL_HEADER) MagickCore/magick-baseconfig.h $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
-MagickCore-uninstall-local:
-       rm -f $(DESTDIR)$(MagickCoreincdir)/magick-baseconfig.h
 install-exec-local-utilities:
        $(mkdir_p) $(DESTDIR)$(bindir)
        cd $(DESTDIR)$(bindir) ; \
@@ -11630,14 +11619,9 @@ all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINE
 install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) \
        $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
 
-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-       $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-       $(HTML_INSTALL_DATA_TARGETS)
+install-data-local: $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS)
 
-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
-       $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \
-       $(HTML_UNINSTALL_DATA_TARGETS) \
-       $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
+uninstall-local: $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS) $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
 
 clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
 

diff --git a/configure b/configure
index 1456afc7aed3c56299221ffe2783cbee99384060..1327f544a8d5a7018b660a2288cbb7e07108c1bb 100755 (executable)
--- a/configure
+++ b/configure
@@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=15814:15816M
+MAGICK_SVN_REVISION=15896M
 
 
 # Substitute library versioning