From b767ab89d0bed2f612ad057b198a3757b81f408f Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Sun, 4 Jul 2021 23:43:59 +0530
Subject: Makefile: Replace top_builddir with builddir.

Since we only have a top-level Makefile, top_builddir and builddir are
the same. Use builddir in the interest of brevity.

* Makefile.am (%.go, SCM_LOG_DRIVER, doc/ccwl.info, doc/ccwl.html):
Replace top_builddire with builddir.
---
 Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a9ad6ca..f3bf68f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ CLEANFILES = $(GOBJECTS)
 EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 %.go: %.scm
-	$(GUILD_GEN)$(top_builddir)/pre-inst-env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
+	$(GUILD_GEN)$(builddir)/pre-inst-env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
 
 moddir = $(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
 godir  = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
@@ -78,9 +78,9 @@ SCM_TESTS = tests/ccwl.scm tests/yaml.scm
 TESTS = $(SCM_TESTS)
 
 SCM_LOG_DRIVER =		\
-  $(top_builddir)/pre-inst-env	\
+  $(builddir)/pre-inst-env	\
   $(GUILE) --no-auto-compile -s \
-  $(top_builddir)/build-aux/test-driver.scm
+  $(builddir)/build-aux/test-driver.scm
 
 EXTRA_DIST +=			\
   $(TESTS)                      \
@@ -118,12 +118,12 @@ CLEANFILES += doc/ccwl.info doc/skribilo.go
 CLEAN_DIRECTORIES = doc/ccwl.html
 
 doc/ccwl.info: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER)
-	$(SKRIBILO_GEN)$(top_builddir)/pre-inst-env $(SKRIBILO) $(SKRIBILO_FLAGS) -t info $< -o $@
+	$(SKRIBILO_GEN)$(builddir)/pre-inst-env $(SKRIBILO) $(SKRIBILO_FLAGS) -t info $< -o $@
 
 doc/ccwl.html: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER)
 	rm -rf $@
 	$(MKDIR_P) $@
-	$(SKRIBILO_GEN)$(top_builddir)/pre-inst-env $(SKRIBILO) $(SKRIBILO_FLAGS) -t html $< -o $@/index.html
+	$(SKRIBILO_GEN)$(builddir)/pre-inst-env $(SKRIBILO) $(SKRIBILO_FLAGS) -t html $< -o $@/index.html
 	cp -vr $(DOC_IMAGES) $@
 
 # The install target depends on the install-data target, which in turn
-- 
cgit v1.2.3