Refactor build of tty-clock (#685)
This commit is contained in:
parent
a0e9a6368f
commit
fdc24f796e
|
@ -1,14 +1,21 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 5028ee4..6294b23 100644
|
||||
index 5028ee4..f3ce14f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -11,7 +11,8 @@ MANPATH = ${DESTDIR}${PREFIX}/share/man/man1
|
||||
@@ -9,16 +9,8 @@ PREFIX ?= /usr/local
|
||||
INSTALLPATH = ${DESTDIR}${PREFIX}/bin
|
||||
MANPATH = ${DESTDIR}${PREFIX}/share/man/man1
|
||||
|
||||
ifeq ($(shell sh -c 'which ncurses5-config>/dev/null 2>/dev/null && echo y'), y)
|
||||
CFLAGS += -Wall -g $$(ncurses5-config --cflags)
|
||||
-ifeq ($(shell sh -c 'which ncurses5-config>/dev/null 2>/dev/null && echo y'), y)
|
||||
- CFLAGS += -Wall -g $$(ncurses5-config --cflags)
|
||||
- LDFLAGS += $$(ncurses5-config --libs)
|
||||
+ # Overwrite instead of appending LDFLAGS, because `ncurses-config --libs` also returns -ltinfo, which it can't find
|
||||
+ LDFLAGS ?= $$(ncurses5-config --libs)
|
||||
else ifeq ($(shell sh -c 'which ncursesw5-config>/dev/null 2>/dev/null && echo y'), y)
|
||||
CFLAGS += -Wall -g $$(ncursesw5-config --cflags)
|
||||
LDFLAGS += $$(ncursesw5-config --libs)
|
||||
-else ifeq ($(shell sh -c 'which ncursesw5-config>/dev/null 2>/dev/null && echo y'), y)
|
||||
- CFLAGS += -Wall -g $$(ncursesw5-config --cflags)
|
||||
- LDFLAGS += $$(ncursesw5-config --libs)
|
||||
-else
|
||||
CFLAGS += -Wall -g $$(pkg-config --cflags ncurses)
|
||||
LDFLAGS += $$(pkg-config --libs ncurses)
|
||||
-endif
|
||||
|
||||
tty-clock : ${SRC}
|
||||
|
||||
|
|
|
@ -5,9 +5,3 @@ TERMUX_PKG_SRCURL=https://github.com/xorg62/tty-clock/archive/v${TERMUX_PKG_VERS
|
|||
TERMUX_PKG_FOLDERNAME=tty-clock-${TERMUX_PKG_VERSION}
|
||||
TERMUX_PKG_DEPENDS="ncurses"
|
||||
TERMUX_PKG_BUILD_IN_SRC=yes
|
||||
|
||||
termux_step_post_configure() {
|
||||
LDFLAGS+=" -lncurses"
|
||||
CFLAGS+=" $CPPFLAGS"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue