Commit d1252d31 authored by Bastien ROUCARIÈS's avatar Bastien ROUCARIÈS

Use modern idiom for autoconf

Forwarded: yes
parent 070d42b5
......@@ -30,8 +30,9 @@ m4_define([magick_micro_version], [5])
m4_define([magick_patchlevel_version], [7])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
m4_define([magick_git_revision], esyscmd([sh -c "(gitversion .) | tr -d '\n'"]))
m4_define([magick_tar_name],[ImageMagick])
m4_define([magick_git_revision], esyscmd([sh -c "(gitversion .) | awk '{ print \$1 }' | tr -d '\n'"]))
m4_define([magick_tar_name],[ImageMagick.magick_major_version])
# ==============================================================================
# Initalize Automake
......@@ -220,7 +221,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
AC_SUBST(LIBEXEC_DIR)
eval "eval DATA_DIR=$datadir"
AC_SUBST(DATA_DIR)
eval "eval DOC_DIR=$datadir/doc"
eval "eval DOC_DIR=$docdir"
AC_SUBST(DOC_DIR)
eval "eval SYSCONF_DIR=$sysconfdir"
AC_SUBST(SYSCONF_DIR)
......@@ -2959,9 +2960,8 @@ AC_SUBST(FILTER_PATH)
#
# Path to ImageMagick documentation files
DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
DOCUMENTATION_PATH="${DOC_DIR}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}"
case "${build_os}" in
mingw* )
DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment