(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 45ee75b6d7cf53c57692fa05268702fab1e8c4ec..a3dbe407af380439086063a6c39fad34076bf373 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10062:10071M"
+#define MagickSVNRevision  "10062:10076M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  10,0,0

diff --git a/configure b/configure
index 72e629a4c4ffcba2646f9a0d9e8ea03ae9cc3419..c4ac975b111e202091bf4f7f281d520380dfea5b 100755 (executable)
--- a/configure
+++ b/configure
@@ -3646,7 +3646,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=10062:10071M
+MAGICK_SVN_REVISION=10062:10076M
 
 
 
@@ -32021,7 +32021,7 @@ _ACEOF
 fi
 
 
-MODULES_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/${MODULES_DIRNAME}"
+MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
 
 MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
 
@@ -32038,7 +32038,7 @@ _ACEOF
 
 
 
-CODER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${CODER_DIRNAME}"
+CODER_RELATIVE_PATH="${CODER_DIRNAME}"
 CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}"
 
 
@@ -32056,7 +32056,7 @@ _ACEOF
 
 
 
-FILTER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${FILTER_DIRNAME}"
+FILTER_RELATIVE_PATH="${FILTER_DIRNAME}"
 FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}"
 
 

diff --git a/configure.ac b/configure.ac
index 32f349ee1472fe9c048768f1d71487c0ebd39b4f..7fe54adc45af8d122ed669342f92c4688801f249 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3009,11 +3009,11 @@ if test "x$MODULES_DIRNAME" = "x"; then
    MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABISUFFIX}
 else
    # not defined by default 
-   AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default)")
+   AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default))
 fi
 AC_SUBST(MODULES_DIRNAME)
 
-MODULES_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/${MODULES_DIRNAME}"
+MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
 AC_SUBST(MODULES_RELATIVE_PATH)
 MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
 AC_SUBST(MODULES_PATH)
@@ -3026,7 +3026,7 @@ fi
 AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME","coders subdirectory".)
 AC_SUBST(CODER_DIRNAME)
 
-CODER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${CODER_DIRNAME}"
+CODER_RELATIVE_PATH="${CODER_DIRNAME}"
 CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}"
 AC_SUBST(CODER_PATH)
 
@@ -3040,7 +3040,7 @@ fi
 AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME","filter subdirectory".)
 AC_SUBST(FILTER_DIRNAME)
 
-FILTER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${FILTER_DIRNAME}"
+FILTER_RELATIVE_PATH="${FILTER_DIRNAME}"
 FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}"
 AC_SUBST(FILTER_PATH)