e992b5ed39
An update to a more recent version (6.7.*) will follow soon. This helps naddy with the png update.
40 lines
1.4 KiB
Plaintext
40 lines
1.4 KiB
Plaintext
$OpenBSD: patch-configure,v 1.5 2011/07/06 22:43:00 kili Exp $
|
|
--- configure.orig Fri Dec 31 15:04:17 2010
|
|
+++ configure Thu Jan 6 14:43:30 2011
|
|
@@ -29429,7 +29429,7 @@ fi
|
|
#
|
|
|
|
# Subdirectory under lib to place ImageMagick lib files
|
|
-LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}"
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define LIBRARY_RELATIVE_PATH "$LIBRARY_RELATIVE_PATH"
|
|
@@ -29533,7 +29533,7 @@ _ACEOF
|
|
|
|
#
|
|
# Path to ImageMagick documentation files
|
|
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
|
|
DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
|
|
DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
|
|
case "${build_os}" in
|
|
@@ -29550,7 +29550,7 @@ _ACEOF
|
|
|
|
#
|
|
# Path to ImageMagick share files
|
|
-SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
|
|
+SHARE_RELATIVE_PATH="${PACKAGE_NAME}"
|
|
SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
|
|
DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
|
|
case "${build_os}" in
|
|
@@ -32677,7 +32677,7 @@ MAGICK_CFLAGS=$CFLAGS
|
|
MAGICK_CXXFLAGS="$CXXFLAGS"
|
|
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
|
|
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
|
|
-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
|
|
+MAGICK_LDFLAGS="$LDFLAGS"
|
|
MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
|
|
|
|
|