diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2025-02-11 18:52:03 +0300 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2025-02-12 11:25:58 +1000 |
| commit | b0e7efa96c9868d1006af376cd699f17e7875e07 (patch) | |
| tree | 74750a8874ce8666827abd27aa9f65917f90e132 | |
| parent | 6ff17c7b8b5dc1db45a16c194a8299b93c999776 (diff) | |
| download | jimtcl-b0e7efa96c9868d1006af376cd699f17e7875e07.zip jimtcl-b0e7efa96c9868d1006af376cd699f17e7875e07.tar.gz jimtcl-b0e7efa96c9868d1006af376cd699f17e7875e07.tar.bz2 | |
build: win32: fix install of `build-jim-ext`
When building for Windows like:
```
> ./configure \
--host=x86_64-w64-mingw32 \
--build=x86_64-linux-gnu \
--disable-ssl \
--minimal
> make -j install DESTDIR=${PWD}/install
```
The following error is encountered:
```
cp build-jim-ext <PWD>/install/usr/local/bin
cp: cannot stat 'build-jim-ext': No such file or directory
```
The suggested fix changes `buildjimext` variable in `auto.def` to a
define and copies `build-jim-ext` only if the define is set.
Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | auto.def | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 29c226b..2fba1c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,7 +118,9 @@ install: all @TCL_EXTS@ install-exec install-docs @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)@includedir@ $(INSTALL_DATA) jim-config.h $(DESTDIR)@includedir@ $(INSTALL_DATA_DIR) $(DESTDIR)@bindir@ +@if BUILD_JIM_EXT $(INSTALL_DATA) build-jim-ext $(DESTDIR)@bindir@ +@endif $(INSTALL_DATA_DIR) $(DESTDIR)@libdir@/pkgconfig $(INSTALL_DATA) jimtcl.pc $(DESTDIR)@libdir@/pkgconfig @@ -549,7 +549,7 @@ if {$withinfo(without) eq "default"} { # Now go check everything - see autosetup/local.tcl array set extinfo [check-extensions [opt-bool allextmod]] -set buildjimext 1 +define BUILD_JIM_EXT 1 # Now special checks if {[have-feature windows]} { @@ -560,7 +560,7 @@ if {[have-feature windows]} { user-error "cygwin/mingw require --shared for dynamic modules" } else { user-notice "Building static library, so build-jim-ext will not work on cygwin/mingw" - set buildjimext 0 + define BUILD_JIM_EXT 0 } } } else { @@ -668,7 +668,7 @@ make-config-header jimautoconf.h -auto {jim_ext_* TCL_PLATFORM_* TCL_LIBRARY USE make-template Makefile.in make-template tests/Makefile.in make-template examples.api/Makefile.in -if {$buildjimext} { +if {[get-define BUILD_JIM_EXT]} { make-template build-jim-ext.in catch {exec chmod +x build-jim-ext} } |