cristy · cristy · commit d286fd7f6934 · 2013-02-24T19:25:33.000Z
diff --git 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:11145M"
+#define MagickSVNRevision  "11115:11148M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
diff --git a/configure b/configure
@@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=11115:11145M
+MAGICK_SVN_REVISION=11115:11148M
 
 
 # Substitute library versioning
@@ -8970,7 +8970,7 @@ else
 fi
 
 
-eval "eval INCLUDEARCH_DIR=$includearch_dir-$MAGICK_MAJOR_VERSION"
+eval "eval INCLUDEARCH_DIR=$includearch_dir"
 
 
 #
diff --git a/configure.ac b/configure.ac
@@ -415,7 +415,7 @@ AC_ARG_WITH([includearch-dir],
                     [includearch_dir=$withval],
                     [includearch_dir=$INCLUDE_DIR])
 
-eval "eval INCLUDEARCH_DIR=$includearch_dir-$MAGICK_MAJOR_VERSION"
+eval "eval INCLUDEARCH_DIR=$includearch_dir"
 AC_SUBST(INCLUDEARCH_DIR)
 
 #

Original file line number	Diff line number	Diff line change
`@@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0`
`3671`	`3671`
`3672`	`3672`	`MAGICK_VERSION=7.0.0-0`
`3673`	`3673`
`3674`		`-MAGICK_SVN_REVISION=11115:11145M`
	`3674`	`+MAGICK_SVN_REVISION=11115:11148M`
`3675`	`3675`
`3676`	`3676`
`3677`	`3677`	`# Substitute library versioning`
`@@ -8970,7 +8970,7 @@ else`
`8970`	`8970`	`fi`
`8971`	`8971`
`8972`	`8972`
`8973`		`-eval "eval INCLUDEARCH_DIR=$includearch_dir-$MAGICK_MAJOR_VERSION"`
	`8973`	`+eval "eval INCLUDEARCH_DIR=$includearch_dir"`
`8974`	`8974`
`8975`	`8975`
`8976`	`8976`	`#`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ AC_ARG_WITH([includearch-dir],`
`415`	`415`	`[includearch_dir=$withval],`
`416`	`416`	`[includearch_dir=$INCLUDE_DIR])`
`417`	`417`
`418`		`-eval "eval INCLUDEARCH_DIR=$includearch_dir-$MAGICK_MAJOR_VERSION"`
	`418`	`+eval "eval INCLUDEARCH_DIR=$includearch_dir"`
`419`	`419`	`AC_SUBST(INCLUDEARCH_DIR)`
`420`	`420`
`421`	`421`	`#`