From 4437d1693e902b10f5cff4fc809377b86f0c2b55 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Tue, 12 Apr 2022 23:40:13 +0200
Subject: [PATCH] Transform `@...@` -> `$(...)`

* This allows for overriding select variables
  when running make, e.g.

    make PS2PDF=/foo/bar/some_other_ps2pdf
---
 Makefile.am                                   | 14 +--
 cmd/dot/Makefile.am                           | 12 +--
 cmd/edgepaint/Makefile.am                     |  4 +-
 cmd/gvedit/Makefile.am                        |  4 +-
 cmd/gvmap/Makefile.am                         | 12 +--
 cmd/gvpr/Makefile.am                          |  4 +-
 cmd/mingle/Makefile.am                        |  4 +-
 cmd/smyrna/Makefile.am                        |  4 +-
 cmd/tools/Makefile.am                         | 82 +++++++++---------
 contrib/diffimg/Makefile.am                   |  8 +-
 contrib/prune/Makefile.am                     |  4 +-
 lib/cdt/Makefile.am                           |  4 +-
 lib/cgraph/Makefile.am                        |  8 +-
 lib/common/Makefile.am                        |  2 +-
 lib/expr/Makefile.am                          | 12 +--
 lib/gvc/Makefile.am                           |  6 +-
 lib/gvpr/Makefile.am                          |  4 +-
 lib/pack/Makefile.am                          |  4 +-
 lib/pathplan/Makefile.am                      |  6 +-
 lib/xdot/Makefile.am                          |  4 +-
 plugin.demo/xgtk/Makefile.am                  |  2 +-
 plugin.demo/xgtk/src/Makefile.am              |  4 +-
 plugin/core/Makefile.am                       |  2 +-
 plugin/devil/Makefile.am                      |  4 +-
 plugin/gd/Makefile.am                         |  4 +-
 plugin/gdiplus/Makefile.am                    |  2 +-
 plugin/gdk/Makefile.am                        |  4 +-
 plugin/gtk/Makefile.am                        |  2 +-
 plugin/lasi/Makefile.am                       |  4 +-
 plugin/pango/Makefile.am                      |  4 +-
 plugin/quartz/Makefile.am                     |  4 +-
 plugin/rsvg/Makefile.am                       |  4 +-
 plugin/visio/Makefile.am                      |  4 +-
 plugin/webp/Makefile.am                       |  4 +-
 plugin/xlib/Makefile.am                       |  8 +-
 tclpkg/Makefile.am                            | 86 +++++++++----------
 tclpkg/gdtclft/Makefile.am                    |  8 +-
 tclpkg/gdtclft/demo/Makefile.am               |  2 +-
 tclpkg/gv/Makefile.am                         | 52 +++++------
 tclpkg/tcldot/Makefile.am                     |  6 +-
 tclpkg/tclpathplan/Makefile.am                |  6 +-
 .../demo/pathplan_data/Makefile.am            |  2 +-
 tclpkg/tclstubs/Makefile.am                   |  4 +-
 tclpkg/tkspline/Makefile.am                   | 16 ++--
 tclpkg/tkstubs/Makefile.am                    |  4 +-
 45 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 175f2a131..5e72359e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ doxygen:
 	doxygen
 
 dist-hook:
-	echo "@VERSION@" >GRAPHVIZ_VERSION
+	echo "$(VERSION)" >GRAPHVIZ_VERSION
 
 BUILT_SOURCES = $(top_builddir)/graphviz_version.h
 
@@ -45,7 +45,7 @@ EXTRA_DIST = $(txt) $(html) graphviz.spec \
 .PHONY: rpm
 rpm: dist
 	mkdir -p $(HOME)/rpmbuild/$(HOSTNAME)/SPECS $(HOME)/rpmbuild/$(HOSTNAME)/SOURCES
-	cp graphviz-@VERSION@.tar.gz $(HOME)/rpmbuild/$(HOSTNAME)/SOURCES/
+	cp graphviz-$(VERSION).tar.gz $(HOME)/rpmbuild/$(HOSTNAME)/SOURCES/
 	case `cut -d' ' -f1 /etc/system-release` in \
 	Fedora) cp redhat/graphviz.spec.fedora $(HOME)/rpmbuild/$(HOSTNAME)/SPECS/graphviz.spec;; \
 	CentOS) cp redhat/graphviz.spec.rhel $(HOME)/rpmbuild/$(HOSTNAME)/SPECS/graphviz.spec;; \
@@ -55,13 +55,13 @@ rpm: dist
 	
 .PHONY: deb
 deb: dist
-	rm -rf graphviz-@VERSION@
-	zcat graphviz-@VERSION@.tar.gz | tar xf -
-	(cd graphviz-@VERSION@; fakeroot make -f debian/rules binary)
+	rm -rf graphviz-$(VERSION)
+	zcat graphviz-$(VERSION).tar.gz | tar xf -
+	(cd graphviz-$(VERSION); fakeroot make -f debian/rules binary)
 	
 .PHONY: pkg
 pkg: dist
-	tar xzf graphviz-@VERSION@.tar.gz && make -C graphviz-@VERSION@/macosx/build && mv graphviz-@VERSION@/macosx/build/graphviz-*.pkg .
+	tar xzf graphviz-$(VERSION).tar.gz && make -C graphviz-$(VERSION)/macosx/build && mv graphviz-$(VERSION)/macosx/build/graphviz-*.pkg .
 
 # codespell is a python script:
 #      https://github.com/lucasdemarchi/codespell
@@ -71,4 +71,4 @@ pkg: dist
 spellcheck:
 	codespell -d -q 3 --skip="*.po,*.ts"
 
-DISTCLEANFILES = config.cache builddate.h FEATURE/* graphviz-@VERSION@*
+DISTCLEANFILES = config.cache builddate.h FEATURE/* graphviz-$(VERSION)*
diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index e4cf04fe7..cb9a6ded3 100644
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -87,22 +87,22 @@ uninstall-hook:
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 dot.1.pdf: dot.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 dot.1.ps: $(srcdir)/dot.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 osage.1.pdf: osage.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 osage.1.ps: $(srcdir)/osage.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 patchwork.1.pdf: patchwork.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 patchwork.1.ps: $(srcdir)/patchwork.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am
index 8c114bbdf..b89afc03c 100644
--- a/cmd/edgepaint/Makefile.am
+++ b/cmd/edgepaint/Makefile.am
@@ -45,10 +45,10 @@ nodist_EXTRA_edgepaint_SOURCES = fake.cxx
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 edgepaint.1.pdf: edgepaint.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 edgepaint.1.ps: $(srcdir)/edgepaint.1
-	@GROFF@ -e -Tps -man -t $< >$@
+	$(GROFF) -e -Tps -man -t $< >$@
 endif
 endif
 
diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index b90f00f67..07c9cfd49 100644
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -70,10 +70,10 @@ attrs.txt: $(top_srcdir)/doc/infosrc/attrs
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvedit.1.pdf: gvedit.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvedit.1.ps: $(srcdir)/gvedit.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/cmd/gvmap/Makefile.am b/cmd/gvmap/Makefile.am
index 7a9b0f5f9..c652373e0 100644
--- a/cmd/gvmap/Makefile.am
+++ b/cmd/gvmap/Makefile.am
@@ -65,22 +65,22 @@ gvmap.sh :
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvmap.1.pdf: gvmap.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvmap.1.ps: $(srcdir)/gvmap.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 cluster.1.pdf: cluster.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 cluster.1.ps: $(srcdir)/cluster.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gvmap.sh.1.pdf: gvmap.sh.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvmap.sh.1.ps: $(srcdir)/gvmap.sh.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am
index 324b721d2..8a9139a6c 100644
--- a/cmd/gvpr/Makefile.am
+++ b/cmd/gvpr/Makefile.am
@@ -38,10 +38,10 @@ gvpr_LDADD = $(top_builddir)/lib/gvpr/libgvpr.la \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvpr.1.pdf: gvpr.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvpr.1.ps: $(srcdir)/gvpr.1
-	@GROFF@ -Tps -man -t $< >$@
+	$(GROFF) -Tps -man -t $< >$@
 endif
 endif
 gvpr_static_SOURCES = gvprmain.c
diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index d9af2411b..3ffd8ac51 100644
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -42,10 +42,10 @@ mingle_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 mingle.1.pdf: mingle.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 mingle.1.ps: $(srcdir)/mingle.1
-	@GROFF@ -e -Tps -man -t $< >$@
+	$(GROFF) -e -Tps -man -t $< >$@
 endif
 endif
 
diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index 657208a60..d953f6aca 100644
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -92,10 +92,10 @@ smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 smyrna.1.pdf: smyrna.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 smyrna.1.ps: $(srcdir)/smyrna.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 0bce64ba6..cc8a2f034 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/pack \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/common \
-	@EXPAT_INCLUDES@
+	$(EXPAT_INCLUDES)
 
 pdfdir = $(pkgdatadir)/doc/pdf
 
@@ -77,15 +77,15 @@ gxl2gv_LDADD = \
 	$(top_builddir)/lib/gvc/libgvc.la \
 	$(top_builddir)/lib/ingraphs/libingraphs_C.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
-	$(top_builddir)/lib/cdt/libcdt.la @EXPAT_LIBS@ 
+	$(top_builddir)/lib/cdt/libcdt.la $(EXPAT_LIBS) 
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gxl2gv.1.pdf: gxl2gv.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gxl2gv.1.ps: $(srcdir)/gxl2gv.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -93,15 +93,15 @@ sccmap_SOURCES = sccmap.c
 
 sccmap_LDADD = \
 	$(top_builddir)/lib/ingraphs/libingraphs_C.la \
-	$(top_builddir)/lib/cgraph/libcgraph.la @EXPAT_LIBS@ 
+	$(top_builddir)/lib/cgraph/libcgraph.la $(EXPAT_LIBS) 
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 sccmap.1.pdf: sccmap.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 sccmap.1.ps: $(srcdir)/sccmap.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -114,10 +114,10 @@ ccomps_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 ccomps.1.pdf: ccomps.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 ccomps.1.ps: $(srcdir)/ccomps.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -131,10 +131,10 @@ tred_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 tred.1.pdf: tred.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 tred.1.ps: $(srcdir)/tred.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -147,10 +147,10 @@ unflatten_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 unflatten.1.pdf: unflatten.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 unflatten.1.ps: $(srcdir)/unflatten.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -163,10 +163,10 @@ acyclic_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 acyclic.1.pdf: acyclic.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 acyclic.1.ps: $(srcdir)/acyclic.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -179,10 +179,10 @@ nop_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 nop.1.pdf: nop.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 nop.1.ps: $(srcdir)/nop.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -195,10 +195,10 @@ gvcolor_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvcolor.1.pdf: gvcolor.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvcolor.1.ps: $(srcdir)/gvcolor.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -211,10 +211,10 @@ bcomps_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 bcomps.1.pdf: bcomps.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 bcomps.1.ps: $(srcdir)/bcomps.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -227,10 +227,10 @@ gc_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gc.1.pdf: gc.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gc.1.ps: $(srcdir)/gc.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -268,10 +268,10 @@ endif
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvpack.1.pdf: gvpack.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvpack.1.ps: $(srcdir)/gvpack.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -282,15 +282,15 @@ mm2gv_LDADD = \
     $(top_builddir)/lib/common/libcommon_C.la \
     $(top_builddir)/lib/gvc/libgvc_C.la \
     $(top_builddir)/lib/pathplan/libpathplan_C.la \
-	$(top_builddir)/lib/cgraph/libcgraph.la @MATH_LIBS@
+	$(top_builddir)/lib/cgraph/libcgraph.la $(MATH_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 mm2gv.1.pdf: mm2gv.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 mm2gv.1.ps: mm2gv.1
-	@GROFF@ -Tps -man -e -t $< >$@
+	$(GROFF) -Tps -man -e -t $< >$@
 endif
 endif
 
@@ -304,24 +304,24 @@ gv2gml_LDADD = \
 gml2gv_SOURCES = gml2gv.c gmlparse.y gmlscan.l
 
 gmlparse.c gmlparse.h: $(top_srcdir)/cmd/tools/gmlparse.y
-	@YACC@ -Wno-yacc -dv $(top_srcdir)/cmd/tools/gmlparse.y -o gmlparse.c
+	$(YACC) -Wno-yacc -dv $(top_srcdir)/cmd/tools/gmlparse.y -o gmlparse.c
  
 gmlparse.o gmlparse.lo gmlscan.o gmlscan.lo : gmlscan.c gmlparse.h
 
 gmlscan.c: $(top_srcdir)/cmd/tools/gmlscan.l
-	@LEX@ --outfile=$@ -i $(top_srcdir)/cmd/tools/gmlscan.l
+	$(LEX) --outfile=$@ -i $(top_srcdir)/cmd/tools/gmlscan.l
 
 gml2gv_LDADD = \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
-	$(top_builddir)/lib/cdt/libcdt.la @MATH_LIBS@
+	$(top_builddir)/lib/cdt/libcdt.la $(MATH_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gml2gv.1.pdf: gml2gv.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gml2gv.1.ps: gml2gv.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -330,15 +330,15 @@ graphml2gv_SOURCES = graphml2gv.c
 graphml2gv_LDADD = \
 	$(top_builddir)/lib/ingraphs/libingraphs_C.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
-	$(top_builddir)/lib/cdt/libcdt.la @EXPAT_LIBS@ 
+	$(top_builddir)/lib/cdt/libcdt.la $(EXPAT_LIBS) 
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 graphml2gv.1.pdf: graphml2gv.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 graphml2gv.1.ps: $(srcdir)/graphml2gv.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -352,25 +352,25 @@ dijkstra_LDADD = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 dijkstra.1.pdf: dijkstra.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 dijkstra.1.ps: $(srcdir)/dijkstra.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
 gvgen_SOURCES = gvgen.c graph_generator.c
 
 gvgen_LDADD = \
-	$(top_builddir)/lib/cgraph/libcgraph.la @MATH_LIBS@
+	$(top_builddir)/lib/cgraph/libcgraph.la $(MATH_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvgen.1.pdf: gvgen.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvgen.1.ps: $(srcdir)/gvgen.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/contrib/diffimg/Makefile.am b/contrib/diffimg/Makefile.am
index c26efa75e..33ed7e841 100644
--- a/contrib/diffimg/Makefile.am
+++ b/contrib/diffimg/Makefile.am
@@ -3,7 +3,7 @@
 VERSION=0.2
 
 AM_CPPFLAGS = \
-	@GDLIB_CFLAGS@ \
+	$(GDLIB_CFLAGS) \
 	-I$(top_srcdir)/lib
 
 pdfdir = $(pkgdatadir)/doc/pdf
@@ -27,15 +27,15 @@ endif
 
 diffimg_SOURCES = diffimg.c
 
-diffimg_LDADD = @GDLIB_LIBS@ @MATH_LIBS@
+diffimg_LDADD = $(GDLIB_LIBS) $(MATH_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 diffimg.1.pdf: diffimg.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 diffimg.1.ps: $(srcdir)/diffimg.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index b6bbc8f7a..ecebc5a55 100644
--- a/contrib/prune/Makefile.am
+++ b/contrib/prune/Makefile.am
@@ -32,10 +32,10 @@ prune_LDADD = $(top_builddir)/lib/ingraphs/libingraphs_C.la \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 prune.1.pdf: prune.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 prune.1.ps: prune.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am
index f2e99cab1..5459d29c6 100644
--- a/lib/cdt/Makefile.am
+++ b/lib/cdt/Makefile.am
@@ -42,10 +42,10 @@ libcdt_la_SOURCES = $(libcdt_C_la_SOURCES)
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 cdt.3.pdf: cdt.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 cdt.3.ps: $(srcdir)/cdt.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index 8c906b435..8869d15f7 100644
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -43,18 +43,18 @@ libcgraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la
 scan.o scan.lo: scan.c grammar.h
 
 scan.c: $(top_srcdir)/lib/cgraph/scan.l
-	@LEX@ --outfile=$@ -i $(top_srcdir)/lib/cgraph/scan.l
+	$(LEX) --outfile=$@ -i $(top_srcdir)/lib/cgraph/scan.l
 
 grammar.c grammar.h: $(top_srcdir)/lib/cgraph/grammar.y
-	@YACC@ -Wno-yacc -dv --output=grammar.c $(top_srcdir)/lib/cgraph/grammar.y
+	$(YACC) -Wno-yacc -dv --output=grammar.c $(top_srcdir)/lib/cgraph/grammar.y
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 cgraph.3.pdf: cgraph.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 cgraph.3.ps: $(srcdir)/cgraph.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 6699051c9..e93d55a56 100644
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -57,7 +57,7 @@ htmllex.o htmllex.lo: htmllex.c htmllex.h htmlparse.h
 htmlparse.o htmlparse.lo: htmlparse.c htmlparse.h
                                                                                 
 htmlparse.c htmlparse.h: $(top_srcdir)/lib/common/htmlparse.y
-	@YACC@ -Wno-yacc -dv $(top_srcdir)/lib/common/htmlparse.y -o htmlparse.c
+	$(YACC) -Wno-yacc -dv $(top_srcdir)/lib/common/htmlparse.y -o htmlparse.c
 
 DISTCLEANFILES = brewer_lib color_lib colortbl.h \
 	htmlparse.[ch]
diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index dd0d5b61c..24950b238 100644
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -39,22 +39,22 @@ $(libexpr_C_la_OBJECTS) $(libexpr_la_OBJECTS): \
 	exparse.h exparse.c exgram.h exop.h
 
 exparse.c: y.tab.c 
-	@SED@ "s/fprintf/sfprintf/g" <y.tab.c | \
-		@SED@ "s/FILE/Sfio_t/g" | \
-		@SED@ "s/stderr/sfstderr/g" > exparse.c
+	$(SED) "s/fprintf/sfprintf/g" <y.tab.c | \
+		$(SED) "s/FILE/Sfio_t/g" | \
+		$(SED) "s/stderr/sfstderr/g" > exparse.c
 
 y.tab.c y.tab.h: y.output
 
 y.output: $(top_srcdir)/lib/expr/exparse.y
-	@YACC@ -Wno-yacc -dtv $(top_srcdir)/lib/expr/exparse.y -o y.tab.c
+	$(YACC) -Wno-yacc -dtv $(top_srcdir)/lib/expr/exparse.y -o y.tab.c
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 expr.3.pdf: expr.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 expr.3.ps: $(srcdir)/expr.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 5aa08267a..186769004 100644
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -59,7 +59,7 @@ libgvc_C_la_LIBADD += $(top_builddir)/lib/ortho/libortho_C.la
 libgvc_C_la_DEPENDENCIES +=  $(top_builddir)/lib/ortho/libortho_C.la
 endif
 if ENABLE_LTDL
-libgvc_C_la_LIBADD += @LIBLTDL@ $(LIBLTDL_LDFLAGS)
+libgvc_C_la_LIBADD += $(LIBLTDL) $(LIBLTDL_LDFLAGS)
 endif
 
 libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined
@@ -74,10 +74,10 @@ libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvc.3.pdf: gvc.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvc.3.ps: $(srcdir)/gvc.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index 7e5909e1f..dd2067320 100644
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -55,10 +55,10 @@ libgvpr_C_la_DEPENDENCIES = \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gvpr.3.pdf: gvpr.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gvpr.3.ps: $(srcdir)/gvpr.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index 2d45c22f2..bddf76fd9 100644
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -35,10 +35,10 @@ libpack_C_la_SOURCES = ccomps.c pack.c
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 pack.3.pdf: pack.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 pack.3.ps: $(srcdir)/pack.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am
index 6f8be5973..16a2667e4 100644
--- a/lib/pathplan/Makefile.am
+++ b/lib/pathplan/Makefile.am
@@ -36,15 +36,15 @@ libpathplan_C_la_SOURCES = cvt.c inpoly.c route.c shortest.c \
 
 libpathplan_la_LDFLAGS = -version-info $(PATHPLAN_VERSION) -no-undefined
 libpathplan_la_SOURCES = $(libpathplan_C_la_SOURCES)
-libpathplan_la_LIBADD = @MATH_LIBS@
+libpathplan_la_LIBADD = $(MATH_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 pathplan.3.pdf: pathplan.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 pathplan.3.ps: $(srcdir)/pathplan.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/lib/xdot/Makefile.am b/lib/xdot/Makefile.am
index acf2bdf23..117b969e9 100644
--- a/lib/xdot/Makefile.am
+++ b/lib/xdot/Makefile.am
@@ -33,10 +33,10 @@ libxdot_la_SOURCES = $(libxdot_C_la_SOURCES)
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 xdot.3.pdf: xdot.3.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 xdot.3.ps: $(srcdir)/xdot.3
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/plugin.demo/xgtk/Makefile.am b/plugin.demo/xgtk/Makefile.am
index a2f5d603c..d8009eaa8 100644
--- a/plugin.demo/xgtk/Makefile.am
+++ b/plugin.demo/xgtk/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS=src
 
 .PHONY: rpm
 rpm: dist
-	rpmbuild -ta xgtk-plugin-@VERSION@.tar.gz
+	rpmbuild -ta xgtk-plugin-$(VERSION).tar.gz
 
 EXTRA_DIST = xgtk-plugin.spec
 
diff --git a/plugin.demo/xgtk/src/Makefile.am b/plugin.demo/xgtk/src/Makefile.am
index 2be564cec..d69f6a785 100644
--- a/plugin.demo/xgtk/src/Makefile.am
+++ b/plugin.demo/xgtk/src/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = $(GVC_CFLAGS) $(GTK_CFLAGS)
 
 #override pkglibdir
-pkglibdir = @GVPLUGIN_DIR@
+pkglibdir = $(GVPLUGIN_DIR)
 
 noinst_HEADERS = support.h interface.h callbacks.h
 noinst_LTLIBRARIES = libgvplugin_xgtk_C.la
@@ -18,7 +18,7 @@ libgvplugin_xgtk_C_la_SOURCES = \
         interface.c \
         callbacks.c 
 
-libgvplugin_xgtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_xgtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_xgtk_la_SOURCES = $(libgvplugin_xgtk_C_la_SOURCES)
 libgvplugin_xgtk_la_LIBADD = $(GTK_LIBS)
 
diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 5c0c7beaf..0520abae7 100644
--- a/plugin/core/Makefile.am
+++ b/plugin/core/Makefile.am
@@ -33,7 +33,7 @@ libgvplugin_core_C_la_SOURCES = \
 	gvrender_core_pic.c \
 	gvloadimage_core.c
 
-libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_core_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
 libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la \
 				$(top_builddir)/lib/cgraph/libcgraph.la \
diff --git a/plugin/devil/Makefile.am b/plugin/devil/Makefile.am
index af4b111ec..1dde16f3f 100644
--- a/plugin/devil/Makefile.am
+++ b/plugin/devil/Makefile.am
@@ -22,9 +22,9 @@ libgvplugin_devil_C_la_SOURCES = \
 	gvplugin_devil.c \
 	gvdevice_devil.c
 
-libgvplugin_devil_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_devil_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_devil_la_SOURCES = $(libgvplugin_devil_C_la_SOURCES)
-libgvplugin_devil_la_LIBADD = @DEVIL_LIBS@
+libgvplugin_devil_la_LIBADD = $(DEVIL_LIBS)
 
 if WITH_WIN32
 libgvplugin_devil_la_LDFLAGS += -no-undefined
diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index d5d7f56ce..5727d63cf 100644
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -28,14 +28,14 @@ libgvplugin_gd_C_la_SOURCES = \
 	gvloadimage_gd.c \
 	gvdevice_gd.c
 
-libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_gd_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES)
 
 if WITH_LIBGD
 libgvplugin_gd_la_LIBADD = \
 	$(top_builddir)/lib/gvc/libgvc.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
-	$(top_builddir)/lib/cdt/libcdt.la @PANGOCAIRO_LIBS@ @GDLIB_LIBS@ @MATH_LIBS@
+	$(top_builddir)/lib/cdt/libcdt.la $(PANGOCAIRO_LIBS) $(GDLIB_LIBS) $(MATH_LIBS)
 libgvplugin_gd_la_DEPENDENCIES =  $(top_builddir)/lib/gvc/libgvc.la
 
 if WITH_WIN32
diff --git a/plugin/gdiplus/Makefile.am b/plugin/gdiplus/Makefile.am
index 754c2eaa3..37ae81815 100644
--- a/plugin/gdiplus/Makefile.am
+++ b/plugin/gdiplus/Makefile.am
@@ -30,7 +30,7 @@ libgvplugin_gdiplus_C_la_SOURCES = \
 	gvtextlayout_gdiplus.cpp
 
 # libtool doesn't want to run with actual Windows import libs, so we force GdiPlus.lib through to the linker
-libgvplugin_gdiplus_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -Wl,"$(PLATFORMSDKLIB)\GdiPlus.lib"
+libgvplugin_gdiplus_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO) -Wl,"$(PLATFORMSDKLIB)\GdiPlus.lib"
 nodist_libgvplugin_gdiplus_la_SOURCES = GdiPlus*.h
 libgvplugin_gdiplus_la_SOURCES = $(libgvplugin_gdiplus_C_la_SOURCES)
 libgvplugin_gdiplus_la_LIBADD = -lgdi32 -lole32 -luuid $(top_builddir)/lib/gvc/libgvc.la
diff --git a/plugin/gdk/Makefile.am b/plugin/gdk/Makefile.am
index 7be1df7bf..9e28df253 100644
--- a/plugin/gdk/Makefile.am
+++ b/plugin/gdk/Makefile.am
@@ -27,10 +27,10 @@ libgvplugin_gdk_C_la_SOURCES = \
 	gvdevice_gdk.c \
 	gvloadimage_gdk.c
 
-libgvplugin_gdk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_gdk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_gdk_la_SOURCES = $(libgvplugin_gdk_C_la_SOURCES)
 libgvplugin_gdk_la_LIBADD = \
-	$(top_builddir)/lib/gvc/libgvc.la @GDK_PIXBUF_LIBS@ @PANGOCAIRO_LIBS@ @GDK_LIBS@
+	$(top_builddir)/lib/gvc/libgvc.la $(GDK_PIXBUF_LIBS) $(PANGOCAIRO_LIBS) $(GDK_LIBS)
 	
 if WITH_WIN32
 libgvplugin_gdk_la_LDFLAGS += -no-undefined
diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am
index 5bfd44a80..f6bc0e6c4 100644
--- a/plugin/gtk/Makefile.am
+++ b/plugin/gtk/Makefile.am
@@ -28,7 +28,7 @@ libgvplugin_gtk_C_la_SOURCES = \
         interface.c \
         callbacks.c 
 
-libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_gtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
 libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
 
diff --git a/plugin/lasi/Makefile.am b/plugin/lasi/Makefile.am
index bf59158f1..dafb684c9 100644
--- a/plugin/lasi/Makefile.am
+++ b/plugin/lasi/Makefile.am
@@ -25,10 +25,10 @@ libgvplugin_lasi_C_la_SOURCES = \
 	gvrender_lasi.cpp \
 	gvloadimage_lasi.c
 
-libgvplugin_lasi_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_lasi_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_lasi_la_SOURCES = $(libgvplugin_lasi_C_la_SOURCES)
 libgvplugin_lasi_la_LIBADD = \
-	$(top_builddir)/lib/gvc/libgvc.la @LASI_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
+	$(top_builddir)/lib/gvc/libgvc.la $(LASI_LIBS) $(PANGOCAIRO_LIBS) $(MATH_LIBS)
 
 if WITH_WIN32
 libgvplugin_lasi_la_LDFLAGS += -no-undefined
diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index 32adf8e5f..eebc3312d 100644
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -28,11 +28,11 @@ libgvplugin_pango_C_la_SOURCES = \
 	gvtextlayout_pango.c \
 	gvloadimage_pango.c
 
-libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_pango_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_pango_la_SOURCES = $(libgvplugin_pango_C_la_SOURCES)
 libgvplugin_pango_la_LIBADD = \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
-	$(top_builddir)/lib/gvc/libgvc.la @PANGOCAIRO_LIBS@ @PANGOFT2_LIBS@ @MATH_LIBS@
+	$(top_builddir)/lib/gvc/libgvc.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(MATH_LIBS)
 
 if WITH_WIN32
 libgvplugin_pango_la_LDFLAGS += -no-undefined
diff --git a/plugin/quartz/Makefile.am b/plugin/quartz/Makefile.am
index ac97bfe60..415d08a8d 100644
--- a/plugin/quartz/Makefile.am
+++ b/plugin/quartz/Makefile.am
@@ -28,9 +28,9 @@ libgvplugin_quartz_C_la_SOURCES = \
 	gvtextlayout_quartz.c \
 	GVTextLayout.m
 
-libgvplugin_quartz_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -framework CoreFoundation
+libgvplugin_quartz_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO) -framework CoreFoundation
 libgvplugin_quartz_la_SOURCES = $(libgvplugin_quartz_C_la_SOURCES)
-libgvplugin_quartz_la_LIBADD = @QUARTZ_LIBS@
+libgvplugin_quartz_la_LIBADD = $(QUARTZ_LIBS)
 
 if WITH_WIN32
 libgvplugin_quartz_la_LDFLAGS += -no-undefined
diff --git a/plugin/rsvg/Makefile.am b/plugin/rsvg/Makefile.am
index 435b93a36..0e0ca7434 100644
--- a/plugin/rsvg/Makefile.am
+++ b/plugin/rsvg/Makefile.am
@@ -22,11 +22,11 @@ libgvplugin_rsvg_C_la_SOURCES = \
 	gvplugin_rsvg.c \
 	gvloadimage_rsvg.c
 
-libgvplugin_rsvg_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_rsvg_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_rsvg_la_SOURCES = $(libgvplugin_rsvg_C_la_SOURCES)
 libgvplugin_rsvg_la_LIBADD = \
 	$(top_builddir)/lib/gvc/libgvc.la \
-	@RSVG_LIBS@ @PANGOCAIRO_LIBS@ @XRENDER_LIBS@
+	$(RSVG_LIBS) $(PANGOCAIRO_LIBS) $(XRENDER_LIBS)
 
 if WITH_WIN32
 libgvplugin_rsvg_la_LDFLAGS += -no-undefined
diff --git a/plugin/visio/Makefile.am b/plugin/visio/Makefile.am
index f39466697..7a2186708 100644
--- a/plugin/visio/Makefile.am
+++ b/plugin/visio/Makefile.am
@@ -27,11 +27,11 @@ libgvplugin_visio_C_la_SOURCES = \
 	VisioText.cpp \
 	gvrender_visio_vdx.cpp
 
-libgvplugin_visio_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_visio_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_visio_la_SOURCES = $(libgvplugin_visio_C_la_SOURCES)
 libgvplugin_visio_la_LIBADD = \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
-	$(top_builddir)/lib/gvc/libgvc.la @VISIO_LIBS@ 
+	$(top_builddir)/lib/gvc/libgvc.la $(VISIO_LIBS) 
 
 if WITH_WIN32
 libgvplugin_visio_la_LDFLAGS += -no-undefined
diff --git a/plugin/webp/Makefile.am b/plugin/webp/Makefile.am
index dbd5e72c2..16183efa0 100644
--- a/plugin/webp/Makefile.am
+++ b/plugin/webp/Makefile.am
@@ -23,9 +23,9 @@ libgvplugin_webp_C_la_SOURCES = \
 	gvloadimage_webp.c \
 	gvdevice_webp.c
 
-libgvplugin_webp_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_webp_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_webp_la_SOURCES = $(libgvplugin_webp_C_la_SOURCES)
-libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@ \
+libgvplugin_webp_la_LIBADD = $(WEBP_LIBS) $(PANGOCAIRO_LIBS) \
 	$(top_builddir)/lib/gvc/libgvc.la
 
 if WITH_WIN32
diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am
index 3d04768c9..31e5aa5ee 100644
--- a/plugin/xlib/Makefile.am
+++ b/plugin/xlib/Makefile.am
@@ -39,10 +39,10 @@ endif
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 vimdot.1.pdf: vimdot.1.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 vimdot.1.ps: $(srcdir)/vimdot.1
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
@@ -50,9 +50,9 @@ libgvplugin_xlib_C_la_SOURCES = \
 	gvplugin_xlib.c \
 	gvdevice_xlib.c
 
-libgvplugin_xlib_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+libgvplugin_xlib_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_xlib_la_SOURCES = $(libgvplugin_xlib_C_la_SOURCES)
-libgvplugin_xlib_la_LIBADD = @PANGOCAIRO_LIBS@ $(X11_LIBS) $(XRENDER_LIBS) @SOCKET_LIBS@ @MATH_LIBS@
+libgvplugin_xlib_la_LIBADD = $(PANGOCAIRO_LIBS) $(X11_LIBS) $(XRENDER_LIBS) $(SOCKET_LIBS) $(MATH_LIBS)
 
 if WITH_WIN32
 libgvplugin_xlib_la_LDFLAGS += -no-undefined
diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am
index f1a1e3d86..7f28f56b0 100644
--- a/tclpkg/Makefile.am
+++ b/tclpkg/Makefile.am
@@ -22,9 +22,9 @@ endif
 
 SUBDIRS = tclstubs tclhandle gdtclft tcldot tclpathplan gv
 
-pkgIndex.tcl: @TCL_PKGINDEX@ @TCL_PKGINDEX_GD@ @TCL_PKGINDEX_SWIG@
+pkgIndex.tcl: $(TCL_PKGINDEX) $(TCL_PKGINDEX_GD) $(TCL_PKGINDEX_SWIG)
 	echo "# end" >end
-	cat @TCL_PKGINDEX@ @TCL_PKGINDEX_GD@ @TCL_PKGINDEX_SWIG@ end >$@
+	cat $(TCL_PKGINDEX) $(TCL_PKGINDEX_GD) $(TCL_PKGINDEX_SWIG) end >$@
 	rm -f end
 
 if ENABLE_SHARED
@@ -34,89 +34,89 @@ if ENABLE_SHARED
 # without root privileges.
 install-data-hook:
 if WITH_LUA
-	-mkdir -p $(DESTDIR)@LUA_INSTALL_DIR@;
-	if test -w $(DESTDIR)@LUA_INSTALL_DIR@; then \
-		(cd $(DESTDIR)@LUA_INSTALL_DIR@; \
+	-mkdir -p $(DESTDIR)$(LUA_INSTALL_DIR);
+	if test -w $(DESTDIR)$(LUA_INSTALL_DIR); then \
+		(cd $(DESTDIR)$(LUA_INSTALL_DIR); \
 			cp -f $(DESTDIR)$(pkgluadir)/libgv_lua.so gv.so;) \
 	else \
-		echo "Warning: @LUA_INSTALL_DIR@ is not writable."; \
+		echo "Warning: $(LUA_INSTALL_DIR) is not writable."; \
 		echo "Skipping system installation of lua binding."; \
 	fi
 endif
 if WITH_PERL
-	-mkdir -p $(DESTDIR)@PERL_INSTALL_DIR@;
-	if test -w $(DESTDIR)@PERL_INSTALL_DIR@; then \
-		(cd $(DESTDIR)@PERL_INSTALL_DIR@; \
+	-mkdir -p $(DESTDIR)$(PERL_INSTALL_DIR);
+	if test -w $(DESTDIR)$(PERL_INSTALL_DIR); then \
+		(cd $(DESTDIR)$(PERL_INSTALL_DIR); \
 			cp -f $(DESTDIR)$(pkgperldir)/libgv_perl.so gv.so; \
 			cp -f $(DESTDIR)$(pkgperldir)/gv.pm gv.pm;) \
 	else \
-		echo "Warning: @PERL_INSTALL_DIR@ is not writable."; \
+		echo "Warning: $(PERL_INSTALL_DIR) is not writable."; \
 		echo "Skipping system installation of perl binding."; \
 	fi
 endif
 if WITH_PHP
-	-mkdir -p $(DESTDIR)@PHP_INSTALL_DIR@;
-	if test -w $(DESTDIR)@PHP_INSTALL_DIR@; then \
-		(cd $(DESTDIR)@PHP_INSTALL_DIR@; \
+	-mkdir -p $(DESTDIR)$(PHP_INSTALL_DIR);
+	if test -w $(DESTDIR)$(PHP_INSTALL_DIR); then \
+		(cd $(DESTDIR)$(PHP_INSTALL_DIR); \
 			cp -f $(DESTDIR)$(pkgphpdir)/libgv_php.so gv.so;) \
 	else \
-		echo "Warning: @PHP_INSTALL_DIR@ is not writable."; \
+		echo "Warning: $(PHP_INSTALL_DIR) is not writable."; \
 		echo "Skipping system installation of php binding."; \
 	fi
-	-mkdir -p $(DESTDIR)@PHP_INSTALL_DATADIR@;
-	if test -w $(DESTDIR)@PHP_INSTALL_DATADIR@; then \
-		(cd $(DESTDIR)@PHP_INSTALL_DATADIR@; \
+	-mkdir -p $(DESTDIR)$(PHP_INSTALL_DATADIR);
+	if test -w $(DESTDIR)$(PHP_INSTALL_DATADIR); then \
+		(cd $(DESTDIR)$(PHP_INSTALL_DATADIR); \
 			cp -f $(DESTDIR)$(pkgphpdir)/gv.php gv.php;) \
 	else \
-		echo "Warning: @PHP_INSTALL_DATADIR@ is not writable."; \
+		echo "Warning: $(PHP_INSTALL_DATADIR) is not writable."; \
 		echo "Skipping system installation of php binding."; \
 	fi
 endif
 if WITH_PYTHON
-	-mkdir -p $(DESTDIR)@PYTHON_INSTALL_DIR@;
-	if test -w $(DESTDIR)@PYTHON_INSTALL_DIR@; then \
-		(cd $(DESTDIR)@PYTHON_INSTALL_DIR@; \
+	-mkdir -p $(DESTDIR)$(PYTHON_INSTALL_DIR);
+	if test -w $(DESTDIR)$(PYTHON_INSTALL_DIR); then \
+		(cd $(DESTDIR)$(PYTHON_INSTALL_DIR); \
 			cp -f $(DESTDIR)$(pkgpythondir)/libgv_python.so _gv.so; \
 			cp -f $(DESTDIR)$(pkgpythondir)/gv.py gv.py;) \
 	else \
-		echo "Warning: @PYTHON_INSTALL_DIR@ is not writable."; \
+		echo "Warning: $(PYTHON_INSTALL_DIR) is not writable."; \
 		echo "Skipping system installation of python binding."; \
 	fi
 endif
 if WITH_PYTHON3
-	-mkdir -p $(DESTDIR)@PYTHON3_INSTALL_DIR@;
-	if test -w $(DESTDIR)@PYTHON3_INSTALL_DIR@; then \
-		(cd $(DESTDIR)@PYTHON3_INSTALL_DIR@; \
+	-mkdir -p $(DESTDIR)$(PYTHON3_INSTALL_DIR);
+	if test -w $(DESTDIR)$(PYTHON3_INSTALL_DIR); then \
+		(cd $(DESTDIR)$(PYTHON3_INSTALL_DIR); \
 			cp -f $(DESTDIR)$(pkgpython3dir)/libgv_python3.so _gv.so; \
 			cp -f $(DESTDIR)$(pkgpython3dir)/gv.py gv.py;) \
 	else \
-		echo "Warning: @PYTHON3_INSTALL_DIR@ is not writable."; \
+		echo "Warning: $(PYTHON3_INSTALL_DIR) is not writable."; \
 		echo "Skipping system installation of python3 binding."; \
 	fi
 endif
 if WITH_RUBY
-	-mkdir -p $(DESTDIR)@RUBY_INSTALL_DIR@;
-	if test -w $(DESTDIR)@RUBY_INSTALL_DIR@; then \
-		(cd $(DESTDIR)@RUBY_INSTALL_DIR@; \
+	-mkdir -p $(DESTDIR)$(RUBY_INSTALL_DIR);
+	if test -w $(DESTDIR)$(RUBY_INSTALL_DIR); then \
+		(cd $(DESTDIR)$(RUBY_INSTALL_DIR); \
 			cp -f $(DESTDIR)$(pkgrubydir)/libgv_ruby.so gv.so;) \
 	else \
-		echo "Warning: @RUBY_INSTALL_DIR@ is not writable."; \
+		echo "Warning: $(RUBY_INSTALL_DIR) is not writable."; \
 		echo "Skipping system installation of ruby binding."; \
 	fi
 endif
 if WITH_TCL
-	-mkdir -p $(DESTDIR)@TCL_INSTALL_DIR@;
-	if test -w $(DESTDIR)@TCL_INSTALL_DIR@/; then \
-		(cd $(DESTDIR)@TCL_INSTALL_DIR@; \
-			cp -rf $(DESTDIR)$(pkgtcldir) @PACKAGE_NAME@;) \
+	-mkdir -p $(DESTDIR)$(TCL_INSTALL_DIR);
+	if test -w $(DESTDIR)$(TCL_INSTALL_DIR)/; then \
+		(cd $(DESTDIR)$(TCL_INSTALL_DIR); \
+			cp -rf $(DESTDIR)$(pkgtcldir) $(PACKAGE_NAME);) \
 	else \
-		echo "Warning: @TCL_INSTALL_DIR@ is not writable."; \
+		echo "Warning: $(TCL_INSTALL_DIR) is not writable."; \
 		echo "Skipping system installation of tcl bindings."; \
 	fi
 endif
 endif
 
-# removal of installs into @xxx_INSTALL_DIR@ fail if root
+# removal of installs into $(xxx_INSTALL_DIR) fail if root
 #     has installed a system copy
 uninstall-hook:
 	-rm -rf $(DESTDIR)$(pkgsharpdir);
@@ -125,21 +125,21 @@ uninstall-hook:
 	-rm -rf $(DESTDIR)$(pkgiodir);
 	-rm -rf $(DESTDIR)$(pkgjavadir);
 	-rm -rf $(DESTDIR)$(pkgluadir);
-	-rm -rf $(DESTDIR)@LUA_INSTALL_DIR@/gv.so;
+	-rm -rf $(DESTDIR)$(LUA_INSTALL_DIR)/gv.so;
 	-rm -rf $(DESTDIR)$(pkgocamldir);
 	-rm -rf $(DESTDIR)$(pkgperldir);
-	-rm -rf $(DESTDIR)@PERL_INSTALL_DIR@/gv.so $(DESTDIR)@PERL_INSTALL_DIR@/gv.pm;
+	-rm -rf $(DESTDIR)$(PERL_INSTALL_DIR)/gv.so $(DESTDIR)$(PERL_INSTALL_DIR)/gv.pm;
 	-rm -rf $(DESTDIR)$(pkgphpdir);
-	-rm -rf $(DESTDIR)@PHP_INSTALL_DIR@/gv.so $(DESTDIR)@PHP_INSTALL_DATADIR@/gv.php;
+	-rm -rf $(DESTDIR)$(PHP_INSTALL_DIR)/gv.so $(DESTDIR)$(PHP_INSTALL_DATADIR)/gv.php;
 	-rm -rf $(DESTDIR)$(pkgpythondir);
-	-rm -rf $(DESTDIR)@PYTHON_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
+	-rm -rf $(DESTDIR)$(PYTHON_INSTALL_DIR)/_gv.so $(DESTDIR)$(PYTHON_INSTALL_DIR)/gv.py;
 	-rm -rf $(DESTDIR)$(pkgpython3dir);
-	-rm -rf $(DESTDIR)@PYTHON3_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON3_INSTALL_DIR@/gv.py;
+	-rm -rf $(DESTDIR)$(PYTHON3_INSTALL_DIR)/_gv.so $(DESTDIR)$(PYTHON3_INSTALL_DIR)/gv.py;
 	-rm -rf $(DESTDIR)$(pkgRdir);
 	-rm -rf $(DESTDIR)$(pkgrubydir);
-	-rm -rf $(DESTDIR)@RUBY_INSTALL_DIR@/gv.so;
+	-rm -rf $(DESTDIR)$(RUBY_INSTALL_DIR)/gv.so;
 	-rm -rf $(DESTDIR)$(pkgtcldir);
-	-rm -rf $(DESTDIR)@TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@;
+	-rm -rf $(DESTDIR)$(TCL_INSTALL_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION);
 
 EXTRA_DIST = mkpkgindex.sh
 
diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 97e01ecaa..88e5bcf6d 100644
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -7,11 +7,11 @@ pkgtcldir = $(pkglibdir)/tcl
 
 AM_CPPFLAGS = \
 	 -I$(top_srcdir) \
-	@GDLIB_CFLAGS@ @TCL_INCLUDES@
+	$(GDLIB_CFLAGS) $(TCL_INCLUDES)
 
 LIBS = @LIBS@ -lc
 
-AM_CFLAGS = @TCL_CFLAGS@
+AM_CFLAGS = $(TCL_CFLAGS)
 
 man = gdtclft.3tcl
 if ENABLE_MAN_PDFS
@@ -59,10 +59,10 @@ endif
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gdtclft.3tcl.pdf: gdtclft.3tcl.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gdtclft.3tcl.ps: $(srcdir)/gdtclft.3tcl
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/tclpkg/gdtclft/demo/Makefile.am b/tclpkg/gdtclft/demo/Makefile.am
index 9f6a2576d..c4efa0ece 100644
--- a/tclpkg/gdtclft/demo/Makefile.am
+++ b/tclpkg/gdtclft/demo/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-demodir = $(datadir)/@PACKAGE@/demo
+demodir = $(datadir)/$(PACKAGE)/demo
 
 if WITH_TCL
 demo_SCRIPTS = entities.tcl
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index b08395237..2cd03a071 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -428,82 +428,82 @@ gv_doc_writer.intermediate: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_la
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 gv.3sharp.pdf: gv.3sharp.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3sharp.ps: gv.3sharp
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3go.pdf: gv.3go.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3go.ps: gv.3go
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3guile.pdf: gv.3guile.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3guile.ps: gv.3guile
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3io.pdf: gv.3io.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3io.ps: gv.3io
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3java.pdf: gv.3java.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3java.ps: gv.3java
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3lua.pdf: gv.3lua.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3lua.ps: gv.3lua
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3ocaml.pdf: gv.3ocaml.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3ocaml.ps: gv.3ocaml
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3perl.pdf: gv.3perl.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3perl.ps: gv.3perl
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3php.pdf: gv.3php.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3php.ps: gv.3php
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3python.pdf: gv.3python.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3python.ps: gv.3python
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3r.pdf: gv.3r.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3r.ps: gv.3r
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3ruby.pdf: gv.3ruby.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3ruby.ps: gv.3ruby
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 
 gv.3tcl.pdf: gv.3tcl.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 gv.3tcl.ps: gv.3tcl
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 install-data-hook:
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index de27ec785..9149e2aa7 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/cdt \
 	-I$(top_srcdir)/lib/pathplan $(TCLHANDLE_INCLUDES) $(GDLIB_CFLAGS) $(TCL_INCLUDES)
 
-LIBS = -lc @TCL_STUB_LIB_SPEC@
+LIBS = -lc $(TCL_STUB_LIB_SPEC)
 
 AM_CFLAGS = $(TCL_CFLAGS)
 
@@ -124,10 +124,10 @@ endif
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 tcldot.3tcl.pdf: tcldot.3tcl.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 tcldot.3tcl.ps: $(srcdir)/tcldot.3tcl
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am
index 172336a78..dde5d8eca 100644
--- a/tclpkg/tclpathplan/Makefile.am
+++ b/tclpkg/tclpathplan/Makefile.am
@@ -7,11 +7,11 @@ pkgtcldir = $(pkglibdir)/tcl
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/tclpkg/tclhandle \
-	-I$(top_srcdir)/lib/pathplan @TCL_INCLUDES@
+	-I$(top_srcdir)/lib/pathplan $(TCL_INCLUDES)
 
-AM_CFLAGS = @TCL_CFLAGS@
+AM_CFLAGS = $(TCL_CFLAGS)
 
-LIBS = -lc @TCL_STUB_LIB_SPEC@
+LIBS = -lc $(TCL_STUB_LIB_SPEC)
 
 noinst_HEADERS = makecw.h simple.h
 if WITH_TCL
diff --git a/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am b/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am
index d56a5112b..82e60176a 100644
--- a/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am
+++ b/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am
@@ -3,7 +3,7 @@
 EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \
 	obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat
 
-pathplanexampledir = $(datadir)/@PACKAGE@/demo/pathplan_data
+pathplanexampledir = $(datadir)/$(PACKAGE)/demo/pathplan_data
 
 if WITH_TCL
 pathplanexample_DATA = $(EXAMPLES)
diff --git a/tclpkg/tclstubs/Makefile.am b/tclpkg/tclstubs/Makefile.am
index 1ff3f146d..66427b65d 100644
--- a/tclpkg/tclstubs/Makefile.am
+++ b/tclpkg/tclstubs/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = @TCL_CFLAGS@ @TCL_INCLUDES@
+AM_CPPFLAGS = $(TCL_CFLAGS) $(TCL_INCLUDES)
 
-LIBS = @TCL_STUB_LIB_SPEC@
+LIBS = $(TCL_STUB_LIB_SPEC)
 
 if WITH_TCL
 noinst_LTLIBRARIES = libtclstubs_C.la
diff --git a/tclpkg/tkspline/Makefile.am b/tclpkg/tkspline/Makefile.am
index 5b5e396d4..7052c09f3 100644
--- a/tclpkg/tkspline/Makefile.am
+++ b/tclpkg/tkspline/Makefile.am
@@ -18,12 +18,12 @@ endif
 
 # If all else fails there is a local copy of tkInt.h in tkstubs/
 AM_CPPFLAGS = \
-	-I@TK_SRC_DIR@/generic \
-	-I@TCL_SRC_DIR@/generic \
-	@TCL_INCLUDES@ @TCLINT_INCLUDES@ \
-	@TK_INCLUDES@ @TKINT_INCLUDES@ -I$(top_srcdir)/tclpkg/tkstubs
+	-I$(TK_SRC_DIR)/generic \
+	-I$(TCL_SRC_DIR)/generic \
+	$(TCL_INCLUDES) $(TCLINT_INCLUDES) \
+	$(TK_INCLUDES) $(TKINT_INCLUDES) -I$(top_srcdir)/tclpkg/tkstubs
 
-AM_CFLAGS = @X_CFLAGS@ @TCL_CFLAGS@  @TK_CFLAGS@ @TK_DEFS@ \
+AM_CFLAGS = $(X_CFLAGS) $(TCL_CFLAGS)  $(TK_CFLAGS) $(TK_DEFS) \
 	-UPACKAGE_NAME -UPACKAGE_STRING -UPACKAGE_TARNAME \
 	-UPACKAGE_VERSION -UPACKAGE_BUGREPORT
 
@@ -39,7 +39,7 @@ libtkspline_la_LDFLAGS = -no-undefined
 libtkspline_la_SOURCES = tkspline.c
 libtkspline_la_LIBADD = \
 	$(top_builddir)/tclpkg/tkstubs/libtkstubs_C.la \
-	$(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la @TK_LIB_SPEC@
+	$(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(TK_LIB_SPEC)
 
 if WITH_TK
 all-local: pkgIndex.tcl
@@ -51,10 +51,10 @@ endif
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 tkspline.3tk.pdf: tkspline.3tk.ps
-	@PS2PDF@ $<
+	$(PS2PDF) $<
 
 tkspline.3tk.ps: $(srcdir)/tkspline.3tk
-	@GROFF@ -Tps -man $< >$@
+	$(GROFF) -Tps -man $< >$@
 endif
 endif
 
diff --git a/tclpkg/tkstubs/Makefile.am b/tclpkg/tkstubs/Makefile.am
index 472bb67f9..2dfaefe22 100644
--- a/tclpkg/tkstubs/Makefile.am
+++ b/tclpkg/tkstubs/Makefile.am
@@ -1,8 +1,8 @@
 # Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = @TCL_CFLAGS@ @TK_CFLAGS@ @TCL_INCLUDES@  @TK_INCLUDES@ @TK_XINCLUDES@
+AM_CPPFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) $(TCL_INCLUDES)  $(TK_INCLUDES) $(TK_XINCLUDES)
                                                                                 
-LIBS = @TK_STUB_LIB_SPEC@
+LIBS = $(TK_STUB_LIB_SPEC)
 
 if WITH_TK
 noinst_LTLIBRARIES = libtkstubs_C.la
-- 
2.40.0