Blob Blame History Raw
diff -Naur hamlib-1.2.13/bindings/Makefile.am hamlib-1.2.13-mod/bindings/Makefile.am
--- hamlib-1.2.13/bindings/Makefile.am	2011-03-12 16:57:07.000000000 +0200
+++ hamlib-1.2.13-mod/bindings/Makefile.am	2011-04-24 14:15:40.000000000 +0300
@@ -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.13/bindings/Makefile.in hamlib-1.2.13-mod/bindings/Makefile.in
--- hamlib-1.2.13/bindings/Makefile.in	2011-03-12 16:58:19.000000000 +0200
+++ hamlib-1.2.13-mod/bindings/Makefile.in	2011-04-24 14:26:13.000000000 +0300
@@ -330,7 +330,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
@@ -787,7 +787,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
 
@@ -806,7 +807,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