From e4a943c42a681388a122d01ae22cfc8b66c47fff Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Mon, 1 Nov 2021 17:04:39 -0700 Subject: [PATCH] fix: exclude cmd/lefty when Lefty is disabled during build When Lefty was disabled (`--enable-lefty` not passed to the build system), several Lefty related artifacts would still be built and installed. E.g. the man page. We now exclude the entire Lefty subdirectory, which should be less error prone. Fixes #2153. Suggested-by: Daniel Macks --- CHANGELOG.md | 1 + cmd/Makefile.am | 6 +++++- cmd/lefty/Makefile.am | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2a3ea25a..d62b1b7c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - remove Bashism from `gvmap.sh` #2151 +- Lefty artifacts are no longer installed when Lefty is disabled #2153 ## [2.49.3] – 2021-10-22 diff --git a/cmd/Makefile.am b/cmd/Makefile.am index 9436c0022..8080d6ecd 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -1,3 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = dot tools gvpr lefty lneato dotty smyrna gvmap gvedit mingle edgepaint +SUBDIRS = dot tools gvpr lneato dotty smyrna gvmap gvedit mingle edgepaint + +if WITH_LEFTY +SUBDIRS += lefty +endif diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am index 9ea07af10..fb4d41cda 100644 --- a/cmd/lefty/Makefile.am +++ b/cmd/lefty/Makefile.am @@ -1,8 +1,6 @@ ## Process this file with automake to produce Makefile.in -if WITH_LEFTY SUBDIRS = ws os dot2l examples -endif # lefty build parameters #not useful / old: @@ -44,7 +42,6 @@ endif noinst_HEADERS = code.h common.h display.h exec.h g.h gfxview.h internal.h \ leftyio.h lex.h mem.h parse.h str.h tbl.h txtview.h -if WITH_LEFTY if WITH_X if WITH_XAW bin_PROGRAMS = lefty @@ -53,7 +50,6 @@ endif if WITH_WIN32 bin_PROGRAMS = lefty endif -endif man_MANS = lefty.1 if ENABLE_MAN_PDFS -- 2.40.0