diff --git a/Makefile.am b/Makefile.am
index 9e78f8e3b..94366882d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,15 @@
 
 #AUTOMAKE_OPTIONS = 1.6
 
-aclocaldir = @datadir@/aclocal
+aclocaldir = $(datadir)/aclocal
 aclocal_DATA = hamlib.m4
 
-pkgconfigdir = @libdir@/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = hamlib.pc
 
 EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer README.betatester
 
-# @BINDINGS_LIST@ subdirs are no more built
+# BINDINGS_LIST subdirs are no more built
 SUBDIRS = macros include lib libltdl src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
 			@BINDINGS@ tests doc
 
diff --git a/alinco/Makefile.am b/alinco/Makefile.am
index f983dae2e..8819d4b18 100644
--- a/alinco/Makefile.am
+++ b/alinco/Makefile.am
@@ -3,6 +3,6 @@ ALINCOSRCLIST = dx77.c
 lib_LTLIBRARIES = hamlib-alinco.la
 hamlib_alinco_la_SOURCES = $(ALINCOSRCLIST) alinco.c
 hamlib_alinco_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_alinco_la_LIBADD = ../src/libhamlib.la
+hamlib_alinco_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = alinco.h
diff --git a/aor/Makefile.am b/aor/Makefile.am
index 51bf71078..69906808d 100644
--- a/aor/Makefile.am
+++ b/aor/Makefile.am
@@ -3,6 +3,6 @@ AORSRCLIST = ar8200.c ar8000.c ar5000.c
 lib_LTLIBRARIES = hamlib-aor.la
 hamlib_aor_la_SOURCES = $(AORSRCLIST) aor.c
 hamlib_aor_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_aor_la_LIBADD = ../src/libhamlib.la
+hamlib_aor_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = aor.h
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 1c2fa2091..183725e2c 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -15,12 +15,12 @@ INCLUDES = @INCLUDES@ -Dbool=char -I@PERL_INC_DIR@ -I@TCL_SRC_DIR@/generic -I$(t
 
 nodist_hamlibperl_la_SOURCES = hamlibperl_wrap.c
 hamlibperl_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlibperl_la_LIBADD = ../src/libhamlib.la
+hamlibperl_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 BUILT_SOURCES  = hamlibperl_wrap.c hamlibtcl_wrap.c
 DISTCLEANFILES = hamlibperl_wrap.c hamlibtcl_wrap.c
 
-hamlibperl_wrap.c: hamlib.swg $(srcdir)/../include/hamlib/rig.h
+hamlibperl_wrap.c: hamlib.swg $(top_srcdir)/include/hamlib/rig.h
 	swig -perl5 -shadow @INCLUDES@ -I$(top_srcdir)/bindings -o $@ `test -f hamlib.swg || echo '$(srcdir)/'`hamlib.swg
 
 
@@ -29,17 +29,19 @@ hamlibperl_wrap.c: hamlib.swg $(srcdir)/../include/hamlib/rig.h
 
 nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
 hamlibtcl_la_LDFLAGS = -no-undefined -module -avoid-version @TCL_LIB_SPEC@
-hamlibtcl_la_LIBADD = ../src/libhamlib.la
+hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
-hamlibtcl_wrap.c: hamlib.swg $(srcdir)/../include/hamlib/rig.h
+hamlibtcl_wrap.c: hamlib.swg $(top_srcdir)/include/hamlib/rig.h
 	swig -tcl @INCLUDES@ -I$(top_srcdir)/bindings -o $@ `test -f hamlib.swg || echo '$(srcdir)/'`hamlib.swg
 
-rig.swg: ../include/hamlib/rig.h ../include/hamlib/riglist.h
-rotator.swg: ../include/hamlib/rotator.h ../include/hamlib/rotlist.h
+rig.swg: $(top_srcdir)/include/hamlib/rig.h $(top_srcdir)/include/hamlib/riglist.h
+rotator.swg: $(top_srcdir)/include/hamlib/rotator.h $(top_srcdir)/include/hamlib/rotlist.h
 
 hamlib.swg: ignore.swg rig.swg rotator.swg
 
-EXTRA_DIST = hamlib.swg ignore.swg rig.swg rotator.swg
+EXTRA_DIST = hamlib.swg ignore.swg rig.swg rotator.swg \
+			perltest.pl tcltest.tcl
 
 CLEANFILES = hamlibperl_wrap.c hamlib.pm hamlibtcl_wrap.c
 
+noinst_SCRIPTS = perltest.pl tcltest.tcl
diff --git a/c++/Makefile.am b/c++/Makefile.am
index cc9ce8a7b..13463d04e 100644
--- a/c++/Makefile.am
+++ b/c++/Makefile.am
@@ -2,7 +2,7 @@
 lib_LTLIBRARIES = libhamlib++.la
 libhamlib___la_SOURCES = rigclass.cc rotclass.cc
 libhamlib___la_LDFLAGS = -no-undefined -release @VERSION@ -version-info 1:0:0
-libhamlib___la_LIBADD = ../src/libhamlib.la
+libhamlib___la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 check_PROGRAMS = testcpp
 TESTS = testcpp
diff --git a/drake/Makefile.am b/drake/Makefile.am
index db6b971e7..aa0a9adc9 100644
--- a/drake/Makefile.am
+++ b/drake/Makefile.am
@@ -3,6 +3,6 @@ DRAKESRC = r8b.c
 lib_LTLIBRARIES = hamlib-drake.la
 hamlib_drake_la_SOURCES = $(DRAKESRC) drake.c
 hamlib_drake_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_drake_la_LIBADD = ../src/libhamlib.la
+hamlib_drake_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = drake.h
diff --git a/dummy/Makefile.am b/dummy/Makefile.am
index f9a30506b..5f227e53a 100644
--- a/dummy/Makefile.am
+++ b/dummy/Makefile.am
@@ -2,6 +2,6 @@
 lib_LTLIBRARIES = hamlib-dummy.la
 hamlib_dummy_la_SOURCES = dummy.c rot_dummy.c
 hamlib_dummy_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_dummy_la_LIBADD = ../src/libhamlib.la
+hamlib_dummy_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = dummy.h rot_dummy.h
diff --git a/easycomm/Makefile.am b/easycomm/Makefile.am
index d54edc27b..3e14b85eb 100644
--- a/easycomm/Makefile.am
+++ b/easycomm/Makefile.am
@@ -2,6 +2,6 @@
 lib_LTLIBRARIES = hamlib-easycomm.la
 hamlib_easycomm_la_SOURCES = easycomm.c
 hamlib_easycomm_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_easycomm_la_LIBADD = ../src/libhamlib.la
+hamlib_easycomm_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = easycomm.h
diff --git a/gnuradio/Makefile.am b/gnuradio/Makefile.am
index a14aac56f..141acf0f2 100644
--- a/gnuradio/Makefile.am
+++ b/gnuradio/Makefile.am
@@ -7,7 +7,7 @@ hamlib_gnuradio_la_SOURCES = gr.c gnuradio.cc
 hamlib_gnuradio_la_LDFLAGS = -no-undefined -module -avoid-version
 
 # requires libgnuradio, libfftw and c++
-hamlib_gnuradio_la_LIBADD = ../src/libhamlib.la @GNURADIO_LIBS@ -lstdc++
+hamlib_gnuradio_la_LIBADD = $(top_builddir)/src/libhamlib.la @GNURADIO_LIBS@ -lstdc++
 
 noinst_HEADERS = gnuradio.h gr_priv.h
 
@@ -15,7 +15,7 @@ noinst_HEADERS = gnuradio.h gr_priv.h
 check_PROGRAMS = testgr
 
 testgr_SOURCES = testgr.cc
-testgr_LDADD = ../src/libhamlib.la @GNURADIO_LIBS@
+testgr_LDADD = $(top_builddir)/src/libhamlib.la @GNURADIO_LIBS@
 testgr_LDFLAGS = -dlopen hamlib-gnuradio.la
-testgr_DEPENDENCIES = hamlib-gnuradio.la ../src/libhamlib.la
+testgr_DEPENDENCIES = hamlib-gnuradio.la $(top_builddir)/src/libhamlib.la
 
diff --git a/icom/Makefile.am b/icom/Makefile.am
index d622a2cdd..729f39a09 100644
--- a/icom/Makefile.am
+++ b/icom/Makefile.am
@@ -5,6 +5,6 @@ ICOMSRCLIST = ic706.c icr8500.c ic735.c ic775.c ic756.c  \
 lib_LTLIBRARIES = hamlib-icom.la
 hamlib_icom_la_SOURCES = $(ICOMSRCLIST) icom.c frame.c optoscan.c
 hamlib_icom_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_icom_la_LIBADD = ../src/libhamlib.la
+hamlib_icom_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = frame.h icom.h icom_defs.h
diff --git a/jrc/Makefile.am b/jrc/Makefile.am
index 105313855..402422983 100644
--- a/jrc/Makefile.am
+++ b/jrc/Makefile.am
@@ -3,6 +3,6 @@ JRCSRCLIST = nrd545.c
 lib_LTLIBRARIES = hamlib-jrc.la
 hamlib_jrc_la_SOURCES = $(JRCSRCLIST) jrc.c
 hamlib_jrc_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_jrc_la_LIBADD = ../src/libhamlib.la
+hamlib_jrc_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = jrc.h
diff --git a/kachina/Makefile.am b/kachina/Makefile.am
index dc4f16e0f..844dbc55e 100644
--- a/kachina/Makefile.am
+++ b/kachina/Makefile.am
@@ -3,6 +3,6 @@ ALINCOSRCLIST = 505dsp.c
 lib_LTLIBRARIES = hamlib-kachina.la
 hamlib_kachina_la_SOURCES = $(ALINCOSRCLIST) kachina.c
 hamlib_kachina_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_kachina_la_LIBADD = ../src/libhamlib.la
+hamlib_kachina_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = kachina.h
diff --git a/pcr/Makefile.am b/pcr/Makefile.am
index bf35cca32..da1b940b7 100644
--- a/pcr/Makefile.am
+++ b/pcr/Makefile.am
@@ -3,6 +3,6 @@ PCRSRCLIST = pcr1000.c pcr100.c
 lib_LTLIBRARIES = hamlib-pcr.la
 hamlib_pcr_la_SOURCES = $(PCRSRCLIST) pcr.c
 hamlib_pcr_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_pcr_la_LIBADD = ../src/libhamlib.la
+hamlib_pcr_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = pcr.h
diff --git a/rpcrig/Makefile.am b/rpcrig/Makefile.am
index 80ac07648..fd202a1d9 100644
--- a/rpcrig/Makefile.am
+++ b/rpcrig/Makefile.am
@@ -4,8 +4,8 @@
 # Note: automake complains rpcrig_xdr.c is generated both with and 
 #  without libtool, hence the copy rpcrig_xdr_lt.c
 
-LDADD = ../src/libhamlib.la ../lib/libmisc.la @NET_LIBS@
-DEPENDENCIES = ../src/libhamlib.la 
+LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la @NET_LIBS@
+DEPENDENCIES = $(top_builddir)/src/libhamlib.la 
 
 BUILT_SOURCES  = rpcrig_xdr.c rpcrig_svc.c  rpcrig_xdr_lt.c rpcrig_clnt.c  rpcrig.h
 DISTCLEANFILES = rpcrig_xdr.c rpcrig_svc.c  rpcrig_xdr_lt.c rpcrig_clnt.c  rpcrig.h
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = hamlib-rpcrig.la
 hamlib_rpcrig_la_SOURCES = rpcrig_backend.c rpcrig_backend.h
 nodist_hamlib_rpcrig_la_SOURCES = rpcrig_xdr_lt.c rpcrig_clnt.c rpcrig.h
 hamlib_rpcrig_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_rpcrig_la_LIBADD = ../src/libhamlib.la @NET_LIBS@
+hamlib_rpcrig_la_LIBADD = $(top_builddir)/src/libhamlib.la @NET_LIBS@
 
 EXTRA_DIST = rpcrig.x $(man_MANS)
 
diff --git a/rpcrot/Makefile.am b/rpcrot/Makefile.am
index 024b57bd3..333a958dc 100644
--- a/rpcrot/Makefile.am
+++ b/rpcrot/Makefile.am
@@ -4,8 +4,8 @@
 # Note: automake complains rpcrot_xdr.c is generated both with and
 #  without libtool, hence the copy rpcrot_xdr_lt.c
 
-LDADD = ../src/libhamlib.la ../lib/libmisc.la @NET_LIBS@
-DEPENDENCIES = ../src/libhamlib.la 
+LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la @NET_LIBS@
+DEPENDENCIES = $(top_builddir)/src/libhamlib.la 
 
 BUILT_SOURCES  = rpcrot_xdr.c rpcrot_svc.c  rpcrot_xdr_lt.c rpcrot_clnt.c  rpcrot.h
 DISTCLEANFILES = rpcrot_xdr.c rpcrot_svc.c  rpcrot_xdr_lt.c rpcrot_clnt.c  rpcrot.h
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = hamlib-rpcrot.la
 hamlib_rpcrot_la_SOURCES = rpcrot_backend.c rpcrot_backend.h
 nodist_hamlib_rpcrot_la_SOURCES = rpcrot_xdr_lt.c rpcrot_clnt.c rpcrot.h
 hamlib_rpcrot_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_rpcrot_la_LIBADD = ../src/libhamlib.la @NET_LIBS@
+hamlib_rpcrot_la_LIBADD = $(top_builddir)/src/libhamlib.la @NET_LIBS@
 
 
 EXTRA_DIST = rpcrot.x $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
index cbf9a3cce..4148adc68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libhamlib.la
 libhamlib_la_SOURCES = $(RIGSRC)
 libhamlib_la_LDFLAGS = -no-undefined -release @VERSION@ -version-info 1:0:0
 libhamlib_la_CFLAGS = -DIN_HAMLIB $(AM_CFLAGS) -DHAMLIB_MODULE_DIR=\"$(libdir)\"
-libhamlib_la_LIBADD = @LIBLTDL@ ../lib/libmisc.la @MATH_LIBS@
+libhamlib_la_LIBADD = @LIBLTDL@ $(top_builddir)/lib/libmisc.la @MATH_LIBS@
 
 noinst_HEADERS = event.h misc.h serial.h iofunc.h cal.h tones.h \
 				rot_conf.h token.h idx_builtin.h
diff --git a/tentec/Makefile.am b/tentec/Makefile.am
index d75e98cab..f566277ae 100644
--- a/tentec/Makefile.am
+++ b/tentec/Makefile.am
@@ -3,6 +3,6 @@ TENTECSRCLIST = rx320.c pegasus.c
 lib_LTLIBRARIES = hamlib-tentec.la
 hamlib_tentec_la_SOURCES = $(TENTECSRCLIST) tentec.c
 hamlib_tentec_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_tentec_la_LIBADD = ../src/libhamlib.la
+hamlib_tentec_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = tentec.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 144653641..caee5773b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,8 +16,8 @@ rigctl_SOURCES = rigctl.c dumpcaps.c
 EXTRA_PROGRAMS = rigmatrix
 
 # all the programs need this
-LDADD = ../src/libhamlib.la ../lib/libmisc.la
-DEPENDENCIES = ../src/libhamlib.la
+LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la
+DEPENDENCIES = $(top_builddir)/src/libhamlib.la
 
 ## Linker options
 listrigs_LDFLAGS = @BACKENDLNK@
diff --git a/uniden/Makefile.am b/uniden/Makefile.am
index 7b5a7c5ce..285fbb978 100644
--- a/uniden/Makefile.am
+++ b/uniden/Makefile.am
@@ -3,6 +3,6 @@ UNIDENSRC = bc895.c
 lib_LTLIBRARIES = hamlib-uniden.la
 hamlib_uniden_la_SOURCES = $(UNIDENSRC) uniden.c
 hamlib_uniden_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_uniden_la_LIBADD = ../src/libhamlib.la
+hamlib_uniden_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = uniden.h
diff --git a/winradio/Makefile.am b/winradio/Makefile.am
index 0212da31f..d051754c5 100644
--- a/winradio/Makefile.am
+++ b/winradio/Makefile.am
@@ -4,6 +4,6 @@ WRSRCLIST = wr1000.c wr1500.c wr1550.c wr3100.c wr3150.c wr3500.c wr3700.c
 lib_LTLIBRARIES = hamlib-winradio.la
 hamlib_winradio_la_SOURCES = $(WRSRCLIST) winradio.c
 hamlib_winradio_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_winradio_la_LIBADD = ../src/libhamlib.la
+hamlib_winradio_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = winradio.h linradio/radio_ioctl.h linradio/wrapi.h
diff --git a/yaesu/Makefile.am b/yaesu/Makefile.am
index 0b8dc2e42..fc83d624c 100644
--- a/yaesu/Makefile.am
+++ b/yaesu/Makefile.am
@@ -3,6 +3,6 @@ YAESUSRC = ft747.c ft817.c ft847.c ft100.c ft920.c
 lib_LTLIBRARIES = hamlib-yaesu.la
 hamlib_yaesu_la_SOURCES = $(YAESUSRC) yaesu.c
 hamlib_yaesu_la_LDFLAGS = -no-undefined -module -avoid-version
-hamlib_yaesu_la_LIBADD = ../src/libhamlib.la
+hamlib_yaesu_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
 noinst_HEADERS = ft747.h ft100.h ft817.h ft847.h ft920.h yaesu.h yaesu_tones.h