From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 28 Oct 2011 19:28:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6720
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23d8104e63d2bb74f7d6a8426bcb4afba16881f6;p=imagemagick

---

diff --git a/config/configure.xml b/config/configure.xml
index 1c2dfe84c..3ee627261 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -16,7 +16,7 @@
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
-  <configure name="SHARE_PATH" value="ARCH/ImageMagick-7.0.0"/>
+  <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7.0.0"/>
   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick/"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.0"/>
diff --git a/configure b/configure
index 882fb022e..4ff5982a3 100755
--- a/configure
+++ b/configure
@@ -8279,7 +8279,7 @@ eval "eval INCLUDEDIR_ARCH=$includedir_arch"
 if test "${with_sharedir_arch+set}" = set; then :
   withval=$with_sharedir_arch; sharedir_arch=$withval
 else
-  sharedir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+  sharedir_arch="${DATA_DIR}"
 fi
 
 
@@ -32048,7 +32048,7 @@ cat >>confdefs.h <<_ACEOF
 #define SHARE_RELATIVE_PATH "$SHARE_RELATIVE_PATH"
 _ACEOF
 
-SHARE_PATH="${SHAREDIR-ARCH}/${SHARE_RELATIVE_PATH}"
+SHARE_PATH="${SHAREDIR_ARCH}/${SHARE_RELATIVE_PATH}"
 DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
diff --git a/configure.ac b/configure.ac
index 06bf1d4e9..3655bfb8a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,7 @@ AC_ARG_WITH([sharedir-arch],
     [AC_HELP_STRING([--sharedir-arch=DIR],
                     [ARCH specific config directory])],
                     [sharedir_arch=$withval],
-                    [sharedir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
+                    [sharedir_arch="${DATA_DIR}"])
 
 eval "eval SHAREDIR_ARCH=$sharedir_arch"
 SHAREDIR_ARCH="$sharedir_arch"
@@ -2968,7 +2968,7 @@ AC_SUBST(CONFIGURE_PATH)
 # Subdirectory to place architecture-independent configuration files
 SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
 AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
-SHARE_PATH="${SHAREDIR-ARCH}/${SHARE_RELATIVE_PATH}"
+SHARE_PATH="${SHAREDIR_ARCH}/${SHARE_RELATIVE_PATH}"
 DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )