(no commit message)

diff --git a/config/configure.xml b/config/configure.xml
index 095270732a2357db9e434b1267b23198e199c3a6..cf1788f066d380061070552ab98cc52ba4c63459 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,12 +10,12 @@
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,0"/>
-  <configure name="SVN_REVISION" value="4049" />
-  <configure name="RELEASE_DATE" value="2011-03-27"/>
+  <configure name="SVN_REVISION" value="4053" />
+  <configure name="RELEASE_DATE" value="2011-03-28"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
-  <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick-6.6.9/"/>
+  <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
   <configure name="SHARE_CONFIGURE_PATH" value="/usr/local/share/ImageMagick-6.6.9"/>
   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-6.6.9/"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>

diff --git a/configure b/configure
index 0fd8f49dae2280f4c4fd561f0698e6f55299ba26..bdafbcc687c0c2a91afb5bdacd502615fadce4aa 100755 (executable)
--- a/configure
+++ b/configure
@@ -3451,7 +3451,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=4049
+MAGICK_SVN_REVISION=4053
 
 
 
@@ -30462,7 +30462,7 @@ _ACEOF
 
 
 # Subdirectory to place ImageMagick configuration files
-CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
 
 cat >>confdefs.h <<_ACEOF
 #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"

diff --git a/configure.ac b/configure.ac
index aa44fa44019e029a4c2fdc821093597caf832665..8be418f6419da370064efd291c41ad6fa5f9654f 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2765,7 +2765,7 @@ AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-
 AC_SUBST(SHARE_PATH)
 
 # Subdirectory to place ImageMagick configuration files
-CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
 AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.)
 CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
 DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"

diff --git a/magick/magick-config.h b/magick/magick-config.h
index e24bf2e09f8e15e2fb8c541426a205db71f8204c..103b1462fd04ba8d8ef0af18f18b8ef35a581fcd 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -44,13 +44,13 @@
 
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH
-#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-6.6.9/"
+#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick/"
 #endif
 
 /* Subdirectory of lib where architecture-dependent configuration files live.
    */
 #ifndef MAGICKCORE_CONFIGURE_RELATIVE_PATH
-#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.9"
+#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick"
 #endif
 
 /* Define if you have DJVU library */

diff --git a/magick/version.h b/magick/version.h
index 2a6699c2adbaf72d50d8893cd73ff84031210493..9498714096194357d2b3ba789271450d80eeb52f 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,15 +27,15 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "4049"
+#define MagickSVNRevision  "4053"
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-03-27"
-#define MagickChangeDate   "20110327"
+#define MagickReleaseDate  "2011-03-28"
+#define MagickChangeDate   "20110328"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "