From: cristy Date: Wed, 27 Feb 2013 01:49:10 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4168 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6aa6761c42969d8cb3adb4db450d21894ff944c;p=imagemagick --- diff --git a/configure b/configure index f8be0a3a4..7a494b491 100755 --- a/configure +++ b/configure @@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=11115:11196M +MAGICK_SVN_REVISION=11115:11198M # Substitute library versioning @@ -32276,7 +32276,7 @@ fi # # Path to ImageMagick header files -INCLUDE_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}" DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/" case "${build_os}" in @@ -32408,7 +32408,7 @@ FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}" # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" case "${build_os}" in diff --git a/configure.ac b/configure.ac index e123f430e..afba912ac 100755 --- a/configure.ac +++ b/configure.ac @@ -2955,7 +2955,7 @@ AC_SUBST(PERLMAINCC) # # Path to ImageMagick header files -INCLUDE_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}" DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/" case "${build_os}" in @@ -3051,7 +3051,7 @@ AC_SUBST(FILTER_PATH) # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" +DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" case "${build_os}" in