commit d55889c67ae5a988f761e64061647191d76c514a
author cristy <urban-warrior@git.imagemagick.org> Sun Mar 27 00:50:24 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sun Mar 27 00:50:24 2011 +0000
tree 8dad1c7a962c0a75d558b6a8438e883e174f09b8
parent 1b80ae36ccc89153f6fa25cab8292a93b6643963

configure

diff --git a/configure b/configure
index c15735c..c04ae77 100755
--- a/configure
+++ b/configure
@@ -573,7 +573,7 @@
 
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
-PACKAGE_TARNAME='ImageMagick'
+PACKAGE_TARNAME='ImageMagick-6.6.8'
 PACKAGE_VERSION='6.6.8'
 PACKAGE_STRING='ImageMagick 6.6.8'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
@@ -959,6 +959,7 @@
 LOCALSTATE_DIR
 SHAREDSTATE_DIR
 SYSCONF_DIR
+DOC_DIR
 DATA_DIR
 LIBEXEC_DIR
 SBIN_DIR
@@ -1756,7 +1757,8 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/ImageMagick]
+  --docdir=DIR            documentation root
+                          [DATAROOTDIR/doc/ImageMagick-6.6.8]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -3996,6 +3998,8 @@
 
 eval "eval DATA_DIR=$datadir"
 
+eval "eval DOC_DIR=$docdir"
+
 eval "eval SYSCONF_DIR=$sysconfdir"
 
 eval "eval SHAREDSTATE_DIR=$sharedstatedir"
@@ -30382,8 +30386,8 @@
 #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
 _ACEOF
 
-CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
@@ -30442,9 +30446,9 @@
 
 #
 # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
-DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
+DOCUMENTATION_RELATIVE_PATH=""
+DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
+DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`