(no commit message)

diff --git a/Magick++/lib/Magick++.pc.in b/Magick++/lib/Magick++.pc.in
index c6643bc9b6f4ffc4e0f18f246996dc3c370060bf..305dc94b7cd66e1330be858a6e6f7ca2c5261b2f 100644 (file)
--- a/Magick++/lib/Magick++.pc.in
+++ b/Magick++/lib/Magick++.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/ImageMagick
+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
 
 
 Name: Magick++

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index fc11afe6c02fcd2585eeee7118bb8df7beac6cd5..97dba32fb4e60d1a71ee77afe5e76978823b927e 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1082,12 +1082,12 @@
 
 /* Directory where ImageMagick architecture headers live. */
 #ifndef MAGICKCORE_INCLUDEARCH_PATH
-#define MAGICKCORE_INCLUDEARCH_PATH "/usr/local/include/ImageMagick/"
+#define MAGICKCORE_INCLUDEARCH_PATH "/usr/local/include/ImageMagick-7/"
 #endif
 
 /* Directory where ImageMagick headers live. */
 #ifndef MAGICKCORE_INCLUDE_PATH
-#define MAGICKCORE_INCLUDE_PATH "/usr/local/include/ImageMagick/"
+#define MAGICKCORE_INCLUDE_PATH "/usr/local/include/ImageMagick-7/"
 #endif
 
 /* ImageMagick is formally installed under prefix */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index bf93eb22b55dab4bd36ff5fc1e3ea54011960905..4a4b661475a89701d7d9adaab7aabf0314d39a9a 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "11115:11142M"
+#define MagickSVNRevision  "11115:11145M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0

diff --git a/configure b/configure
index e4dafffb4a7d7327e5db546374804ff501fa3956..768b98112b3df0e5bdfd0df75e2455b27b9fce07 100755 (executable)
--- a/configure
+++ b/configure
@@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=11115:11144M
+MAGICK_SVN_REVISION=11115:11145M
 
 
 # Substitute library versioning