GraphicsMagick: TclMagick/Makefile.am: AM_DISTCHECK_CONFIGURE_FL...

GraphicsMagick Commits <[email protected]> Fri, 20 Sep 2024 12:20:26 -0500
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.22334.1726852840.8001.graphicsmagick-commit@lists.sourceforge.net>
changeset 377926dd1d12 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=377926dd1d12
summary: TclMagick/Makefile.am: AM_DISTCHECK_CONFIGURE_FLAGS - Change the argument to --exec-prefix so that 'make distcheck' now passes.

diffstat:

 ChangeLog             |  2 ++
 TclMagick/Makefile.am |  2 +-
 TclMagick/Makefile.in |  2 +-
 www/ChangeLog.html    |  4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 49a2c65edc99 -r 377926dd1d12 ChangeLog
--- a/ChangeLog	Fri Sep 20 09:05:52 2024 -0500
+++ b/ChangeLog	Fri Sep 20 12:20:09 2024 -0500
@@ -3,6 +3,8 @@
 	* TclMagick/Makefile.am: Now uses non-recursive build and produces
 	xz tarball.  The make 'distcheck' target is not working properly
 	yet.
+	(AM_DISTCHECK_CONFIGURE_FLAGS): Change the argument to
+	--exec-prefix so that 'make distcheck' now passes.
 
 2024-09-19  Bob Friesenhahn  <[email protected]>
 
diff -r 49a2c65edc99 -r 377926dd1d12 TclMagick/Makefile.am
--- a/TclMagick/Makefile.am	Fri Sep 20 09:05:52 2024 -0500
+++ b/TclMagick/Makefile.am	Fri Sep 20 12:20:09 2024 -0500
@@ -5,7 +5,7 @@
 
 AUTOMAKE_OPTIONS = 1.12 subdir-objects dist-zip dist-xz no-dist-gzip foreign
 ACLOCAL_AMFLAGS = -I unix/m4
-AM_DISTCHECK_CONFIGURE_FLAGS = --with-tcl=${TCL_BIN_DIR} --with-tk=${TK_BIN_DIR} --with-magick=${wand_config} --exec-prefix=${prefix}
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-tcl=${TCL_BIN_DIR} --with-tk=${TK_BIN_DIR} --with-magick=${wand_config} --exec-prefix="$$dc_install_base"
 
 EXTRA_DIST=LICENSE tests images doc pkgIndex.tcl
 
diff -r 49a2c65edc99 -r 377926dd1d12 TclMagick/Makefile.in
--- a/TclMagick/Makefile.in	Fri Sep 20 09:05:52 2024 -0500
+++ b/TclMagick/Makefile.in	Fri Sep 20 12:20:09 2024 -0500
@@ -460,7 +460,7 @@
 wand_config = @wand_config@
 AUTOMAKE_OPTIONS = 1.12 subdir-objects dist-zip dist-xz no-dist-gzip foreign
 ACLOCAL_AMFLAGS = -I unix/m4
-AM_DISTCHECK_CONFIGURE_FLAGS = --with-tcl=${TCL_BIN_DIR} --with-tk=${TK_BIN_DIR} --with-magick=${wand_config} --exec-prefix=${prefix}
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-tcl=${TCL_BIN_DIR} --with-tk=${TK_BIN_DIR} --with-magick=${wand_config} --exec-prefix="$$dc_install_base"
 EXTRA_DIST = LICENSE tests images doc pkgIndex.tcl
 TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library`
 PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
diff -r 49a2c65edc99 -r 377926dd1d12 www/ChangeLog.html
--- a/www/ChangeLog.html	Fri Sep 20 09:05:52 2024 -0500
+++ b/www/ChangeLog.html	Fri Sep 20 12:20:09 2024 -0500
@@ -43,7 +43,9 @@
 <ul class="simple">
 <li><p>TclMagick/Makefile.am: Now uses non-recursive build and produces
 xz tarball.  The make 'distcheck' target is not working properly
-yet.</p></li>
+yet.
+(AM_DISTCHECK_CONFIGURE_FLAGS): Change the argument to
+--exec-prefix so that 'make distcheck' now passes.</p></li>
 </ul>
 </blockquote>
 <p>2024-09-19  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>