diff --git a/Magick++/lib/Magick++.pc.in b/Magick++/lib/Magick++.pc.in index c6643bc9b6..305dc94b7c 100644 --- 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 fc11afe6c0..97dba32fb4 100644 --- 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 bf93eb22b5..4a4b661475 100644 --- 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 e4dafffb4a..768b98112b 100755 --- 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