From: cristy Date: Thu, 24 Mar 2011 16:05:38 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7898 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=386ddcd059ac50d60cefd1c6c907f1f744dbf81c;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index e6f05be35..e8b0f03bd 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -259,7 +259,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libMagickWand.so.4* %{_bindir}/[a-z]* %{_sysconfdir}/%{name}-%{VERSION} -%{_localstatedir}/%{name}-%{VERSION} +%{_localstatedir}/lib/%{name}-%{VERSION} %{_libdir}/%{name}-%{VERSION} %{_datadir}/%{name}-%{VERSION} %{_mandir}/man[145]/[a-zA-Z]* diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in index c24f974fe..3e1ba467e 100644 --- a/ImageMagick.spec.in +++ b/ImageMagick.spec.in @@ -259,7 +259,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libMagickWand.so.4* %{_bindir}/[a-z]* %{_sysconfdir}/%{name}-%{VERSION} -%{_localstatedir}/%{name}-%{VERSION} +%{_localstatedir}/lib/%{name}-%{VERSION} %{_libdir}/%{name}-%{VERSION} %{_datadir}/%{name}-%{VERSION} %{_mandir}/man[145]/[a-zA-Z]* diff --git a/config/configure.xml b/config/configure.xml index 704c56e67..465ebc405 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/configure b/configure index 2f7d3415e..c15735c50 100755 --- a/configure +++ b/configure @@ -30382,8 +30382,8 @@ cat >>confdefs.h <<_ACEOF #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH" _ACEOF -CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/" -DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/" +CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/" +DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/" case "${build_os}" in mingw* ) DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1` diff --git a/configure.ac b/configure.ac index 2aa59e6d7..a28557762 100755 --- a/configure.ac +++ b/configure.ac @@ -2709,8 +2709,8 @@ AC_SUBST(LIBRARY_PATH) # Subdirectory to place ImageMagick configuration files CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.) -CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/" -DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/" +CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/" +DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/" case "${build_os}" in mingw* ) DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1` diff --git a/magick/magick-config.h b/magick/magick-config.h index df11fbf8a..51e2642aa 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -44,7 +44,7 @@ /* Directory where architecture-dependent configuration files live. */ #ifndef MAGICKCORE_CONFIGURE_PATH -#define MAGICKCORE_CONFIGURE_PATH "/usr/local/var/ImageMagick-6.6.8/" +#define MAGICKCORE_CONFIGURE_PATH "/usr/local/var/lib/ImageMagick-6.6.8/" #endif /* Subdirectory of lib where architecture-dependent configuration files live. diff --git a/magick/version.h b/magick/version.h index c30421a93..dd3224e59 100644 --- a/magick/version.h +++ b/magick/version.h @@ -33,8 +33,8 @@ extern "C" { #define MagickLibAddendum "-7" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-03-21" -#define MagickChangeDate "20110321" +#define MagickReleaseDate "2011-03-24" +#define MagickChangeDate "20110324" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/utilities/convert.1 b/utilities/convert.1 index 4e919bedc..7765a4bc2 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -247,10 +247,10 @@ Image Sequence Operators: \-write filename write images to this file Image Stack Operators: - \-clone index clone an image - \-delete index delete the image from the image sequence + \-clone indexes clone an image + \-delete indexes delete the image from the image sequence \-duplicate count,indexes - duplicate an image one or more times + duplicate an image one or more times \-insert index insert last image into the image sequence \-swap indexes swap two images in the image sequence diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 5d645aca4..4b71d0575 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -249,9 +249,9 @@ Image Sequence Operators: \-write filename write images to this file Image Stack Operators: - \-delete index delete the image from the image sequence + \-delete indexes delete the image from the image sequence \-duplicate count,indexes - duplicate an image one or more times + duplicate an image one or more times \-insert index insert last image into the image sequence \-swap indexes swap two images in the image sequence diff --git a/utilities/montage.1 b/utilities/montage.1 index a57a66504..c11ea8acf 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -109,8 +109,8 @@ Image Sequence Operators: \-coalesce merge a sequence of images Image Stack Operators: - \-clone index clone an image - \-delete index delete the image from the image sequence + \-clone indexes clone an image + \-delete indexes delete the image from the image sequence \-duplicate count,indexes duplicate an image one or more times \-insert index insert last image into the image sequence