diff -Naur hamlib-1.2.12/bindings/Makefile.am hamlib-1.2.12-mod/bindings/Makefile.am --- hamlib-1.2.12/bindings/Makefile.am 2010-09-04 00:23:29.000000000 +0300 +++ hamlib-1.2.12-mod/bindings/Makefile.am 2010-11-05 21:34:44.000000000 +0200 @@ -32,7 +32,8 @@ 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 @@ -52,7 +53,7 @@ $(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. diff -Naur hamlib-1.2.12/bindings/Makefile.in hamlib-1.2.12-mod/bindings/Makefile.in --- hamlib-1.2.12/bindings/Makefile.in 2010-09-04 00:25:41.000000000 +0300 +++ hamlib-1.2.12-mod/bindings/Makefile.in 2010-11-05 20:55:33.000000000 +0200 @@ -229,6 +229,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_INC_DIR = @PERL_INC_DIR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -305,7 +307,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ ltdl_LIBOBJS = @ltdl_LIBOBJS@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ mandir = @mandir@ @@ -340,7 +341,7 @@ hamlibperl_wrap.c Hamlib.pm Hamlib.bs AM_CFLAGS = -fno-strict-aliasing @ENABLE_TCL_TRUE@tcl_ltlib = hamlibtcl.la -@ENABLE_TCL_TRUE@tcldir = $(prefix)/lib/tcl +@ENABLE_TCL_TRUE@tcldir = $(libdir)/tcl @ENABLE_TCL_TRUE@PKG_VER = 1.0 @ENABLE_TCL_TRUE@DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@ @ENABLE_TCL_TRUE@nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c @@ -797,7 +798,8 @@ 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 @@ -816,7 +818,7 @@ $(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
