(no commit message)

diff --git a/MagickCore/ImageMagick.pc.in b/MagickCore/ImageMagick.pc.in
index 3d3174699f8ad61ee48e38689f270af14ae6ca8a..3729664c4a8bf6921344319281bf7ee97c35d293 100644 (file)
--- a/MagickCore/ImageMagick.pc.in
+++ b/MagickCore/ImageMagick.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/ImageMagick
+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
 
 Name: ImageMagick
 Description: ImageMagick - Convert, Edit, and Compose Images (ABI @MAGICK_ABI_SUFFIX@)

diff --git a/MagickCore/MagickCore.pc.in b/MagickCore/MagickCore.pc.in
index f2562bd2bce5b655703d7757353817d739c050be..98adb6c4fcf44e71f93584e0b8315467aa4ef5d0 100644 (file)
--- a/MagickCore/MagickCore.pc.in
+++ b/MagickCore/MagickCore.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/ImageMagick
+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
 
 Name: MagickCore
 Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 461e77c729894fa2c6555462bb8ee9fc6c12dc02..31c177ea58519da117672dc5882d11a90b052506 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "11008:11080M"
+#define MagickSVNRevision  "11115:11140M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  1
 #define MagickLibMinInterface  1
-#define MagickReleaseDate  "2013-02-22"
+#define MagickReleaseDate  "2013-02-24"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/MagickWand/MagickWand.pc.in b/MagickWand/MagickWand.pc.in
index 5fa63aad2aafb7a533ebacd06c632b54caad96ae..9af8473165a0bdfe81de93a3301a05ca39896b36 100644 (file)
--- a/MagickWand/MagickWand.pc.in
+++ b/MagickWand/MagickWand.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/ImageMagick
+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
 
 Name: MagickWand
 Version: @PACKAGE_VERSION@

diff --git a/configure b/configure
index 756b517e55256f441574819b01cb415ec8b7f880..98abf96de45c855209cd171633e9f1b96106b42f 100755 (executable)
--- a/configure
+++ b/configure
@@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=11008:11080M
+MAGICK_SVN_REVISION=11115:11140M
 
 
 # Substitute library versioning
@@ -25986,7 +25986,7 @@ fi
 
 # Assume that delegate headers reside under same directory as ImageMagick
 # installation prefix.
-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS"
+MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick-$MAGICK_MAJOR_VERSION $MAGICK_CPPFLAGS"
 
 #
 # Find the X11 RGB database

diff --git a/configure.ac b/configure.ac
index 6c1dd0687d9d1750b2080359e7d1dff29e7cb516..ce68bba105a3e20549f19aa4829b576812c0ab06 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1268,7 +1268,7 @@ fi
 
 # Assume that delegate headers reside under same directory as ImageMagick
 # installation prefix.
-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS"
+MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick-$MAGICK_MAJOR_VERSION $MAGICK_CPPFLAGS"
 
 #
 # Find the X11 RGB database