From 52fb5d0558e473e4b92a7e449210b7c1dd390823 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Mon, 1 Nov 2021 17:04:42 -0700 Subject: [PATCH] fix: exclude cmd/smyrna when Smyrna is disabled during build Similar to the situation just fixed with Lefty, when Smyrna was disabled (`--with-smyrna=no` passed to the build system), several Smyrna related artifacts would still be built and installed. We now exclude the entire Smyrna subdirectory, which should be less error prone. Related to #2153. --- CHANGELOG.md | 1 + cmd/Makefile.am | 6 +++++- cmd/smyrna/Makefile.am | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d62b1b7c2..a496d3807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - remove Bashism from `gvmap.sh` #2151 - Lefty artifacts are no longer installed when Lefty is disabled #2153 +- Smyrna artifacts are no longer installed when Smyrna is disabled ## [2.49.3] – 2021-10-22 diff --git a/cmd/Makefile.am b/cmd/Makefile.am index 8080d6ecd..2e7b7aaf7 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -1,7 +1,11 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = dot tools gvpr lneato dotty smyrna gvmap gvedit mingle edgepaint +SUBDIRS = dot tools gvpr lneato dotty gvmap gvedit mingle edgepaint if WITH_LEFTY SUBDIRS += lefty endif + +if WITH_SMYRNA +SUBDIRS += smyrna +endif diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am index 16340d29f..e8cde249d 100644 --- a/cmd/smyrna/Makefile.am +++ b/cmd/smyrna/Makefile.am @@ -18,7 +18,6 @@ AM_CPPFLAGS = \ bin_PROGRAMS = man_MANS = pdf_DATA = -if WITH_SMYRNA if ENABLE_SHARED bin_PROGRAMS += smyrna endif @@ -29,7 +28,6 @@ man_MANS += smyrna.1 if ENABLE_MAN_PDFS pdf_DATA += smyrna.1.pdf endif -endif if ENABLE_MAN_PDFS if HAVE_PS2PDF -- 2.40.0