646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
31 lines
884 B
Diff
31 lines
884 B
Diff
diff --git a/Makefile b/Makefile
|
|
index 8fca24ee38..33b59b5b96 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -39,9 +39,9 @@
|
|
## Comment these out to disable "linenoise"-library support
|
|
HISTFILE = .picocom_history
|
|
CPPFLAGS += -DHISTFILE=\"$(HISTFILE)\" \
|
|
- -DLINENOISE
|
|
-OBJS += linenoise-1.0/linenoise.o
|
|
-linenoise-1.0/linenoise.o : linenoise-1.0/linenoise.c linenoise-1.0/linenoise.h
|
|
+ -DLINENOISE \
|
|
+ $(shell $(PKG_CONFIG) --cflags linenoise)
|
|
+LDFLAGS += $(shell $(PKG_CONFIG) --libs linenoise)
|
|
|
|
## Comment this in to enable (force) custom baudrate support
|
|
## even on systems not enabled by default.
|
|
diff --git a/picocom.c b/picocom.c
|
|
index 775ee9c3bb..ba2f9bd666 100644
|
|
--- a/picocom.c
|
|
+++ b/picocom.c
|
|
@@ -48,7 +48,7 @@
|
|
#include "split.h"
|
|
#include "term.h"
|
|
#ifdef LINENOISE
|
|
-#include "linenoise-1.0/linenoise.h"
|
|
+#include <linenoise.h>
|
|
#endif
|
|
|
|
#include "custbaud.h"
|