Skip to content

Commit 9489fe2

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/pull/8561
1 parent cd1e49f commit 9489fe2

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3171,7 +3171,7 @@ MAGICK_DELEGATES = @MAGICK_DELEGATES@
31713171
MAGICK_DEP_LIBS = @MAGICK_DEP_LIBS@
31723172
MAGICK_EXTRA_DEP_LIBS = @MAGICK_EXTRA_DEP_LIBS@
31733173
MAGICK_FEATURES = @MAGICK_FEATURES@
3174-
MAGICK_FILTER_MODULE_PATH = @MAGICK_FILTER_MODULE_PATH@
3174+
MAGICK_CODER_FILTER_PATH = @MAGICK_CODER_FILTER_PATH@
31753175
MAGICK_GIT_REVISION = @MAGICK_GIT_REVISION@
31763176
MAGICK_HDRI = @MAGICK_HDRI@
31773177
MAGICK_LDFLAGS = @MAGICK_LDFLAGS@

PerlMagick/check.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
echo "LD_LIBRARY_PATH='${LD_LIBRARY_PATH}'"
2121
echo "MAGICK_CODER_MODULE_PATH='${MAGICK_CODER_MODULE_PATH}'"
2222
echo "MAGICK_CONFIGURE_PATH='${MAGICK_CONFIGURE_PATH}'"
23-
echo "MAGICK_FILTER_MODULE_PATH='${MAGICK_FILTER_MODULE_PATH}'"
23+
echo "MAGICK_CODER_FILTER_PATH='${MAGICK_CODER_FILTER_PATH}'"
2424
echo "MAKE='${MAKE}'"
2525
echo "MAKEFLAGS='${MAKEFLAGS}'"
2626
echo "MEMCHECK='${MEMCHECK}'"

common.shi.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ WANDTEST="@abs_top_builddir@/tests/wandtest"
2020
LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:@abs_top_builddir@/wand/.libs:${LD_LIBRARY_PATH}"
2121
MAGICK_CODER_MODULE_PATH="@abs_top_builddir@/coders"
2222
MAGICK_CONFIGURE_PATH="@abs_top_builddir@/config:@abs_top_srcdir@/config"
23-
MAGICK_FILTER_MODULE_PATH="@abs_top_builddir@/filters"
23+
MAGICK_CODER_FILTER_PATH="@abs_top_builddir@/filters"
2424
MAGICK_FONT="@abs_top_srcdir@/PerlMagick/demo/Generic.ttf"
2525
MAGICK_THREAD_LIMIT=2
2626
PATH="@abs_top_builddir@/utilities:@abs_top_builddir@/tests:${PATH}"

configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ LDFLAGS
10371037
CFLAGS
10381038
CC
10391039
DIRSEP
1040-
MAGICK_FILTER_MODULE_PATH
1040+
MAGICK_CODER_FILTER_PATH
10411041
MAGICK_CONFIGURE_BUILD_PATH
10421042
MAGICK_CONFIGURE_SRC_PATH
10431043
MAGICK_CODER_MODULE_PATH
@@ -5540,14 +5540,14 @@ builddir="`pwd`"
55405540
MAGICK_CODER_MODULE_PATH="${builddir}/coders"
55415541
MAGICK_CONFIGURE_SRC_PATH="${srcdirfull}/config"
55425542
MAGICK_CONFIGURE_BUILD_PATH="${builddir}/config"
5543-
MAGICK_FILTER_MODULE_PATH="${builddir}/filters"
5543+
MAGICK_CODER_FILTER_PATH="${builddir}/filters"
55445544
DIRSEP=':'
55455545
case "${build_os}" in
55465546
mingw* )
55475547
MAGICK_CODER_MODULE_PATH=`$WinPathScript "${MAGICK_CODER_MODULE_PATH}" 0`
55485548
MAGICK_CONFIGURE_SRC_PATH=`$WinPathScript "${MAGICK_CONFIGURE_SRC_PATH}" 0`
55495549
MAGICK_CONFIGURE_BUILD_PATH=`$WinPathScript "${MAGICK_CONFIGURE_BUILD_PATH}" 0`
5550-
MAGICK_FILTER_MODULE_PATH=`$WinPathScript "${MAGICK_FILTER_MODULE_PATH}" 0`
5550+
MAGICK_CODER_FILTER_PATH=`$WinPathScript "${MAGICK_CODER_FILTER_PATH}" 0`
55515551
DIRSEP=';'
55525552
;;
55535553
esac

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,14 @@ builddir="`pwd`"
237237
MAGICK_CODER_MODULE_PATH="${builddir}/coders"
238238
MAGICK_CONFIGURE_SRC_PATH="${srcdirfull}/config"
239239
MAGICK_CONFIGURE_BUILD_PATH="${builddir}/config"
240-
MAGICK_FILTER_MODULE_PATH="${builddir}/filters"
240+
MAGICK_CODER_FILTER_PATH="${builddir}/filters"
241241
DIRSEP=':'
242242
case "${build_os}" in
243243
mingw* )
244244
MAGICK_CODER_MODULE_PATH=`$WinPathScript "${MAGICK_CODER_MODULE_PATH}" 0`
245245
MAGICK_CONFIGURE_SRC_PATH=`$WinPathScript "${MAGICK_CONFIGURE_SRC_PATH}" 0`
246246
MAGICK_CONFIGURE_BUILD_PATH=`$WinPathScript "${MAGICK_CONFIGURE_BUILD_PATH}" 0`
247-
MAGICK_FILTER_MODULE_PATH=`$WinPathScript "${MAGICK_FILTER_MODULE_PATH}" 0`
247+
MAGICK_CODER_FILTER_PATH=`$WinPathScript "${MAGICK_CODER_FILTER_PATH}" 0`
248248
DIRSEP=';'
249249
;;
250250
esac
@@ -256,7 +256,7 @@ esac
256256
AC_SUBST([MAGICK_CODER_MODULE_PATH])
257257
AC_SUBST([MAGICK_CONFIGURE_SRC_PATH])
258258
AC_SUBST([MAGICK_CONFIGURE_BUILD_PATH])
259-
AC_SUBST([MAGICK_FILTER_MODULE_PATH])
259+
AC_SUBST([MAGICK_CODER_FILTER_PATH])
260260
AC_SUBST([DIRSEP])
261261

262262

magick.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ top_builddir='/home/cristy/ImageMagick-6'
2525
MAGICK_CODER_MODULE_PATH='/home/cristy/ImageMagick-6/coders'
2626
MAGICK_CONFIGURE_SRC_PATH='/home/cristy/ImageMagick-6/config'
2727
MAGICK_CONFIGURE_BUILD_PATH='/home/cristy/ImageMagick-6/config'
28-
MAGICK_FILTER_MODULE_PATH='/home/cristy/ImageMagick-6/filters'
28+
MAGICK_CODER_FILTER_PATH='/home/cristy/ImageMagick-6/filters'
2929
DIRSEP=':'
3030

3131
PATH="${top_builddir}/utilities:${PATH}"
@@ -38,6 +38,6 @@ env \
3838
LD_LIBRARY_PATH="${top_builddir}/magick/.libs:${top_builddir}/wand/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
3939
MAGICK_CODER_MODULE_PATH="${MAGICK_CODER_MODULE_PATH}" \
4040
MAGICK_CONFIGURE_PATH="${MAGICK_CONFIGURE_BUILD_PATH}${DIRSEP}${MAGICK_CONFIGURE_SRC_PATH}" \
41-
MAGICK_FILTER_MODULE_PATH="${MAGICK_FILTER_MODULE_PATH}" \
41+
MAGICK_CODER_FILTER_PATH="${MAGICK_CODER_FILTER_PATH}" \
4242
PATH="${PATH}" \
4343
"$@"

magick.sh.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ top_builddir='@abs_top_builddir@'
2525
MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@'
2626
MAGICK_CONFIGURE_SRC_PATH='@MAGICK_CONFIGURE_SRC_PATH@'
2727
MAGICK_CONFIGURE_BUILD_PATH='@MAGICK_CONFIGURE_BUILD_PATH@'
28-
MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@'
28+
MAGICK_CODER_FILTER_PATH='@MAGICK_CODER_FILTER_PATH@'
2929
DIRSEP=':'
3030

3131
PATH="${top_builddir}/utilities:${PATH}"
@@ -38,6 +38,6 @@ env \
3838
LD_LIBRARY_PATH="${top_builddir}/magick/.libs:${top_builddir}/wand/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
3939
MAGICK_CODER_MODULE_PATH="${MAGICK_CODER_MODULE_PATH}" \
4040
MAGICK_CONFIGURE_PATH="${MAGICK_CONFIGURE_BUILD_PATH}${DIRSEP}${MAGICK_CONFIGURE_SRC_PATH}" \
41-
MAGICK_FILTER_MODULE_PATH="${MAGICK_FILTER_MODULE_PATH}" \
41+
MAGICK_CODER_FILTER_PATH="${MAGICK_CODER_FILTER_PATH}" \
4242
PATH="${PATH}" \
4343
"$@"

0 commit comments

Comments
 (0)