diff --git a/Makefile.in b/Makefile.in
index 6ea36bd..8814a00 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2316,7 +2316,6 @@
CL_CFLAGS = @CL_CFLAGS@
CL_LIBS = @CL_LIBS@
CODER_PATH = @CODER_PATH@
-CONFIGDIR_ARCH = @CONFIGDIR_ARCH@
CONFIGURE_ARGS = @CONFIGURE_ARGS@
CONFIGURE_PATH = @CONFIGURE_PATH@
CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
@@ -2545,6 +2544,7 @@
SCANDecodeDelegate = @SCANDecodeDelegate@
SED = @SED@
SET_MAKE = @SET_MAKE@
+SHAREDIR_ARCH = @SHAREDIR_ARCH@
SHAREDSTATE_DIR = @SHAREDSTATE_DIR@
SHARE_PATH = @SHARE_PATH@
SHELL = @SHELL@
diff --git a/config/configure.xml b/config/configure.xml
index 37d6ebd..1c2dfe8 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -15,13 +15,13 @@
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
- <configure name="CONFIGURE_PATH" value="/usr/local/lib/ImageMagick-7.0.0/ImageMagick/"/>
- <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7.0.0"/>
+ <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
+ <configure name="SHARE_PATH" value="ARCH/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"/>
<configure name="INCLUDEDIR_ARCH" value="/usr/local/include"/>
- <configure name="CONFIGDIR_ARCH" value="/usr/local/lib/ImageMagick-7.0.0"/>
+ <configure name="CONFIGDIR_ARCH" value="@CONFIGDIR_ARCH@"/>
<configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.0/modules-Q16/coders"/>
<configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.0/modules-Q16/filters"/>
<configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
diff --git a/configure b/configure
index 50b924a..882fb02 100755
--- a/configure
+++ b/configure
@@ -918,7 +918,7 @@
PTHREAD_LIBS
PTHREAD_CC
ax_pthread_config
-CONFIGDIR_ARCH
+SHAREDIR_ARCH
INCLUDEDIR_ARCH
WinPathScript
USING_CL_FALSE
@@ -1087,7 +1087,7 @@
enable_bounds_checking
enable_osx_universal_binary
with_includedir_arch
-with_configdir_arch
+with_sharedir_arch
with_threads
enable_openmp
enable_opencl
@@ -1856,7 +1856,7 @@
--with-dmalloc use dmalloc, as in
http://www.dmalloc.com/dmalloc.tar.gz
--includedir-arch=DIR ARCH specific include directory
- --configdir-arch=DIR ARCH specific config directory
+ --sharedir-arch=DIR ARCH specific config directory
--without-threads disable threads support
--with-pic try to use only PIC/non-PIC objects [default=use
both]
@@ -8275,16 +8275,16 @@
# ARCH specific configuration directory
#
-# Check whether --with-configdir-arch was given.
-if test "${with_configdir_arch+set}" = set; then :
- withval=$with_configdir_arch; configdir_arch=$withval
+# Check whether --with-sharedir-arch was given.
+if test "${with_sharedir_arch+set}" = set; then :
+ withval=$with_sharedir_arch; sharedir_arch=$withval
else
- configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+ sharedir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
fi
-eval "eval CONFIGDIR_ARCH=$configdir_arch"
-CONFIGDIR_ARCH="$configdir_arch"
+eval "eval SHAREDIR_ARCH=$sharedir_arch"
+SHAREDIR_ARCH="$sharedir_arch"
#
@@ -31904,6 +31904,7 @@
#
# Configure install Paths
#
+
# Path to ImageMagick header files
INCLUDE_RELATIVE_PATH="ImageMagick"
INCLUDE_PATH="${INCLUDEDIR_ARCH}/${INCLUDE_RELATIVE_PATH}"
@@ -32026,7 +32027,7 @@
#define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
_ACEOF
-CONFIGURE_PATH="${CONFIGDIR_ARCH}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
@@ -32047,7 +32048,7 @@
#define SHARE_RELATIVE_PATH "$SHARE_RELATIVE_PATH"
_ACEOF
-SHARE_PATH="${DATA_DIR}/${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 7e06d43..06bf1d4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -391,15 +391,15 @@
#
# ARCH specific configuration directory
#
-AC_ARG_WITH([configdir-arch],
- [AC_HELP_STRING([--configdir-arch=DIR],
+AC_ARG_WITH([sharedir-arch],
+ [AC_HELP_STRING([--sharedir-arch=DIR],
[ARCH specific config directory])],
- [configdir_arch=$withval],
- [configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
+ [sharedir_arch=$withval],
+ [sharedir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
-eval "eval CONFIGDIR_ARCH=$configdir_arch"
-CONFIGDIR_ARCH="$configdir_arch"
-AC_SUBST(CONFIGDIR_ARCH)
+eval "eval SHAREDIR_ARCH=$sharedir_arch"
+SHAREDIR_ARCH="$sharedir_arch"
+AC_SUBST(SHAREDIR_ARCH)
#
# Enable support for threads
@@ -2872,6 +2872,7 @@
#
# Configure install Paths
#
+
# Path to ImageMagick header files
INCLUDE_RELATIVE_PATH="ImageMagick"
INCLUDE_PATH="${INCLUDEDIR_ARCH}/${INCLUDE_RELATIVE_PATH}"
@@ -2954,7 +2955,7 @@
# Subdirectory to place architecture-dependent configuration files
CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.)
-CONFIGURE_PATH="${CONFIGDIR_ARCH}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
@@ -2967,7 +2968,7 @@
# 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="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
+SHARE_PATH="${SHAREDIR-ARCH}/${SHARE_RELATIVE_PATH}"
DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )