diff -up ./bindings/Makefile.am.orig ./bindings/Makefile.am
--- ./bindings/Makefile.am.orig 2008-12-15 23:00:24.000000000 +0100
+++ ./bindings/Makefile.am 2008-12-15 23:00:41.000000000 +0100
@@ -29,7 +29,7 @@ Hamlib-pl.mk: $(srcdir)/Makefile.PL
CC="$(CC)" \
OBJECT="hamlibperl_wrap.o" \
VERSION="$(PACKAGE_VERSION)" \
- LIBS="-L$(top_builddir)/src/.libs -lhamlib"
+ LIBS="-L$(top_builddir)/src/.libs -lhamlib" INSTALLDIRS=vendor
sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
mv Hamlib-pl-norpath.mk Hamlib-pl.mk
@@ -49,7 +49,7 @@ distcheck-perl: Hamlib-pl.mk
$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
install-perl: Hamlib-pl.mk
- $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
+ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk pure_install
## ExtUtils::MakeMaker says uninstall is deprecated and won't remove the files
## anyway, so we'll have to figure out another way to remove the installed files.
@@ -62,7 +62,7 @@ uninstall-perl: ## Hamlib-pl.mk
tcl_ltlib = hamlibtcl.la
-tcldir = $(prefix)/lib/tcl
+tcldir = $(libdir)/tcl
PKG_VER=1.0
DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
@@ -96,7 +96,7 @@ uninstall-tcl:
python_ltlib = _Hamlib.la
-pythondir = $(prefix)/lib/python
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c
_Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version
diff -up ./bindings/Makefile.in.orig ./bindings/Makefile.in
--- ./bindings/Makefile.in.orig 2008-12-15 23:00:08.000000000 +0100
+++ ./bindings/Makefile.in 2008-12-15 23:00:03.000000000 +0100
@@ -273,7 +273,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pyexecdir = @pyexecdir@
-pythondir = $(prefix)/lib/python
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
@@ -289,7 +289,7 @@ AM_CFLAGS = -fno-strict-aliasing
##########################################
# Tcl binding
tcl_ltlib = hamlibtcl.la
-tcldir = $(prefix)/lib/tcl
+tcldir = $(libdir)/tcl
PKG_VER = 1.0
DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
@@ -669,7 +669,7 @@ Hamlib-pl.mk: $(srcdir)/Makefile.PL
CC="$(CC)" \
OBJECT="hamlibperl_wrap.o" \
VERSION="$(PACKAGE_VERSION)" \
- LIBS="-L$(top_builddir)/src/.libs -lhamlib"
+ LIBS="-L$(top_builddir)/src/.libs -lhamlib" INSTALLDIRS=vendor
sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
mv Hamlib-pl-norpath.mk Hamlib-pl.mk
@@ -688,7 +688,7 @@ distcheck-perl: Hamlib-pl.mk
$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
install-perl: Hamlib-pl.mk
- $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
+ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk pure_install
uninstall-perl: ## Hamlib-pl.mk