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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2a3ea25a2f6b629b38ac5b2ffbef4b1515ad154..d62b1b7c2a49573a6008fb733cac9cb672acc03a 100644 (file)
--- 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 9436c0022d4612a16467689edb440038b5d51f3e..8080d6ecd8824d6191054029bcf60553a06ae27b 100644 (file)
--- 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 9ea07af10e6c05c34050b46c0ea91c321d535ab0..fb4d41cdab9d868f682356f1a1ce00488ff9deee 100644 (file)
--- 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