- 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
This commit is contained in:
Reinhard Max 2021-01-14 12:28:25 +00:00 committed by Git OBS Bridge
parent 64be1839a5
commit d7e115a551
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 14 10:21:47 UTC 2021 - Reinhard Max <max@suse.com>
- 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 <max@suse.com> Mon Jan 4 13:54:08 UTC 2021 - Reinhard Max <max@suse.com>

View File

@ -83,17 +83,17 @@ the Tcl language itself.
%build %build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %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 cd unix
autoconf autoconf
%configure \ %configure \
--enable-man-symlinks \ --enable-man-symlinks \
--enable-man-compression=gzip \ --enable-man-compression=gzip \
--without-tzdata --without-tzdata
%define scriptdir %_libdir/tcl
make %{?_smp_mflags} \ make %{?_smp_mflags} \
PACKAGE_DIR=%_libdir/tcl \ PACKAGE_DIR="%scriptdir"
TCL_LIBRARY="%scriptdir/tcl%TCL_MINOR" \
TCL_PACKAGE_PATH="%_libdir/tcl %_datadir/tcl"
%check %check
cd unix cd unix
@ -146,8 +146,7 @@ exit 0
%install %install
make -C unix install install-private-headers \ make -C unix install install-private-headers \
INSTALL_ROOT=%buildroot \ INSTALL_ROOT=%buildroot
TCL_LIBRARY="%scriptdir/tcl%TCL_MINOR"
rm -f %buildroot%scriptdir/tcl%TCL_MINOR/ldAix rm -f %buildroot%scriptdir/tcl%TCL_MINOR/ldAix
ln -sf tclsh%TCL_MINOR %buildroot%_prefix/bin/tclsh ln -sf tclsh%TCL_MINOR %buildroot%_prefix/bin/tclsh
ln -sf tclsh.1.gz %buildroot%_mandir/man1/tclsh%TCL_MINOR.1.gz ln -sf tclsh.1.gz %buildroot%_mandir/man1/tclsh%TCL_MINOR.1.gz