From 59d6099865cd9049b3344887b4a5b3b1d4b87cd8 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Thu, 27 Feb 2020 14:03:44 -0800 Subject: [PATCH] Update Makefile Makefile enhancement to better handle ncurses library from Bob Dunlop. --- Tools/unix/cpmtools/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tools/unix/cpmtools/Makefile b/Tools/unix/cpmtools/Makefile index 8c56b657..d630b6f2 100644 --- a/Tools/unix/cpmtools/Makefile +++ b/Tools/unix/cpmtools/Makefile @@ -13,6 +13,9 @@ DEVICE = posix DISKDEFS=$(shell cd ../../cpmtools ; pwd)/diskdefs DEFFORMAT=wbw_fd144 +# Locate the ncurses libs or try a guess if pkg-config does not exist +NCURSESLIBS=$(shell if env pkg-config --libs ncurses ; then : ; else echo -lncurses ; fi) + CPPFLAGS = -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\" DEVICEOBJ = device_posix.o @@ -44,7 +47,7 @@ fsck.cpm: fsck.cpm.o cpmfs.o getopt.o getopt1.o $(DEVICEOBJ) $(CC) $(LDFLAGS) -o $@ fsck.cpm.o cpmfs.o getopt.o getopt1.o $(DEVICEOBJ) fsed.cpm: fsed.cpm.o cpmfs.o getopt.o getopt1.o $(DEVICEOBJ) - $(CC) $(LDFLAGS) -o $@ fsed.cpm.o cpmfs.o getopt.o getopt1.o $(DEVICEOBJ) -lncurses + $(CC) $(LDFLAGS) -o $@ fsed.cpm.o cpmfs.o getopt.o getopt1.o $(DEVICEOBJ) $(NCURSESLIBS) $(DEST): mkdir -p $(DEST)