summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2016-08-30 14:24:04 +0200
committerDidier Raboud <odyx@debian.org>2017-08-25 09:41:39 +0200
commit72b15e09f8352dd683627b29be45f6f3fc85cdf6 (patch)
tree958f00eb6bb34ff43ba5fa6c2a16c8550292ef08
parent04ef9ba7db656ce7eb78a8c1ad051557db9d6432 (diff)
Use package-provided jimsh and libjim
Gbp-Pq: Name 0002-Use-package-provided-jimsh-and-libjim.patch
-rw-r--r--Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index a6dd5f4..1b33817 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,8 @@ UDEVDIR = $(DESTDIR)/lib/udev
SBINDIR = $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man/man1
VPATH = jimtcl
-HOST_TCL := $(shell cd jim && ./autosetup/find-tclsh)
-ifeq (,$(findstring jimsh0,$(HOST_TCL)))
-TCL ?= $(HOST_TCL)
-else
-TCL ?= /usr/bin/tclsh
-endif
+HOST_TCL := /usr/bin/jimsh
+TCL := /usr/bin/jimsh
JIM_CONFIGURE_OPTS = --disable-lineedit \
--with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr
@@ -49,7 +45,7 @@ jim/libjim.a:
dispatcher-script: usb_modeswitch.tcl
sed 's_!/usr/bin/tclsh_!'"$(TCL)"'_' < usb_modeswitch.tcl > usb_modeswitch_dispatcher
-dispatcher-shared: jim/libjim.so dispatcher.c usb_modeswitch.string
+dispatcher-shared: dispatcher.c usb_modeswitch.string
$(CC) dispatcher.c $(LDFLAGS) -Ljim -ljim -Ijim -o usb_modeswitch_dispatcher $(CFLAGS)
dispatcher-static: jim/libjim.a dispatcher.c usb_modeswitch.string