From d7e115a551b1bcfc4ac6c512a7e6f1f2c2c8b9c031479d4ee924a24ab18bf2d1 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 14 Jan 2021 12:28:25 +0000 Subject: [PATCH] - tclConfig.sh: Fix path names and avoid braces in TCL_PACKAGE_PATH - Set TCL_LIBRARY at configure time for better consistency. OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=129 --- tcl.changes | 6 ++++++ tcl.spec | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tcl.changes b/tcl.changes index 9b589c5..4dee8e1 100644 --- a/tcl.changes +++ b/tcl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 14 10:21:47 UTC 2021 - Reinhard Max + +- tclConfig.sh: Fix path names and avoid braces in TCL_PACKAGE_PATH +- Set TCL_LIBRARY at configure time for better consistency. + ------------------------------------------------------------------- Mon Jan 4 13:54:08 UTC 2021 - Reinhard Max diff --git a/tcl.spec b/tcl.spec index b01628d..00b677c 100644 --- a/tcl.spec +++ b/tcl.spec @@ -83,17 +83,17 @@ the Tcl language itself. %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects +%define scriptdir %_libdir/tcl +export TCL_PACKAGE_PATH="%scriptdir %_datadir/tcl" +export TCL_LIBRARY="%scriptdir/tcl%TCL_MINOR" cd unix autoconf %configure \ --enable-man-symlinks \ --enable-man-compression=gzip \ --without-tzdata -%define scriptdir %_libdir/tcl make %{?_smp_mflags} \ - PACKAGE_DIR=%_libdir/tcl \ - TCL_LIBRARY="%scriptdir/tcl%TCL_MINOR" \ - TCL_PACKAGE_PATH="%_libdir/tcl %_datadir/tcl" + PACKAGE_DIR="%scriptdir" %check cd unix @@ -146,8 +146,7 @@ exit 0 %install make -C unix install install-private-headers \ - INSTALL_ROOT=%buildroot \ - TCL_LIBRARY="%scriptdir/tcl%TCL_MINOR" + INSTALL_ROOT=%buildroot rm -f %buildroot%scriptdir/tcl%TCL_MINOR/ldAix ln -sf tclsh%TCL_MINOR %buildroot%_prefix/bin/tclsh ln -sf tclsh.1.gz %buildroot%_mandir/man1/tclsh%TCL_MINOR.1.gz