|
|
86a5cc0 |
diff -Naur hamlib-1.2.9/bindings/Makefile.in hamlib-1.2.9-mod/bindings/Makefile.in
|
|
|
86a5cc0 |
--- hamlib-1.2.9/bindings/Makefile.in 2009-02-25 21:18:37.000000000 +0200
|
|
|
86a5cc0 |
+++ hamlib-1.2.9-mod/bindings/Makefile.in 2009-08-19 08:07:17.000000000 +0300
|
|
|
86a5cc0 |
@@ -268,7 +268,7 @@
|
|
|
86a5cc0 |
program_transform_name = @program_transform_name@
|
|
|
86a5cc0 |
psdir = @psdir@
|
|
|
86a5cc0 |
pyexecdir = @pyexecdir@
|
|
|
86a5cc0 |
-pythondir = $(prefix)/lib/python
|
|
|
86a5cc0 |
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
|
|
|
86a5cc0 |
sbindir = @sbindir@
|
|
|
86a5cc0 |
sharedstatedir = @sharedstatedir@
|
|
|
86a5cc0 |
srcdir = @srcdir@
|
|
|
86a5cc0 |
@@ -287,7 +287,7 @@
|
|
|
86a5cc0 |
##########################################
|
|
|
86a5cc0 |
# Tcl binding
|
|
|
86a5cc0 |
tcl_ltlib = hamlibtcl.la
|
|
|
86a5cc0 |
-tcldir = $(prefix)/lib/tcl
|
|
|
86a5cc0 |
+tcldir = $(libdir)/tcl
|
|
|
86a5cc0 |
PKG_VER = 1.0
|
|
|
86a5cc0 |
DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
|
|
|
86a5cc0 |
nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
|
|
|
86a5cc0 |
@@ -672,7 +672,7 @@
|
|
|
86a5cc0 |
CC="$(CC)" \
|
|
|
86a5cc0 |
OBJECT="hamlibperl_wrap.o" \
|
|
|
86a5cc0 |
VERSION="$(PACKAGE_VERSION)" \
|
|
|
86a5cc0 |
- LIBS="-L$(top_builddir)/src/.libs -lhamlib"
|
|
|
2e3238a |
+ LIBS="-L$(top_builddir)/src/.libs -lhamlib" INSTALLDIRS=vendor
|
|
|
86a5cc0 |
sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
|
|
|
86a5cc0 |
mv Hamlib-pl-norpath.mk Hamlib-pl.mk
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
@@ -691,7 +691,7 @@
|
|
|
86a5cc0 |
$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
install-perl: Hamlib-pl.mk
|
|
|
86a5cc0 |
- $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
|
|
|
86a5cc0 |
+ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk pure_install
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
uninstall-perl: ## Hamlib-pl.mk
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
diff -Naur hamlib-1.2.9/bindings/Makefile.am hamlib-1.2.9-mod/bindings/Makefile.am
|
|
|
86a5cc0 |
--- hamlib-1.2.9/bindings/Makefile.am 2008-06-26 18:23:06.000000000 +0300
|
|
|
86a5cc0 |
+++ hamlib-1.2.9-mod/bindings/Makefile.am 2009-08-19 08:06:17.000000000 +0300
|
|
|
86a5cc0 |
@@ -29,7 +29,7 @@
|
|
|
86a5cc0 |
CC="$(CC)" \
|
|
|
86a5cc0 |
OBJECT="hamlibperl_wrap.o" \
|
|
|
86a5cc0 |
VERSION="$(PACKAGE_VERSION)" \
|
|
|
86a5cc0 |
- LIBS="-L$(top_builddir)/src/.libs -lhamlib"
|
|
|
2e3238a |
+ LIBS="-L$(top_builddir)/src/.libs -lhamlib" INSTALLDIRS=vendor
|
|
|
86a5cc0 |
sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
|
|
|
86a5cc0 |
mv Hamlib-pl-norpath.mk Hamlib-pl.mk
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
@@ -49,7 +49,7 @@
|
|
|
86a5cc0 |
$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
install-perl: Hamlib-pl.mk
|
|
|
86a5cc0 |
- $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
|
|
|
86a5cc0 |
+ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk pure_install
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
## ExtUtils::MakeMaker says uninstall is deprecated and won't remove the files
|
|
|
86a5cc0 |
## anyway, so we'll have to figure out another way to remove the installed files.
|
|
|
86a5cc0 |
@@ -62,7 +62,7 @@
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
tcl_ltlib = hamlibtcl.la
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
-tcldir = $(prefix)/lib/tcl
|
|
|
86a5cc0 |
+tcldir = $(libdir)/tcl
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
PKG_VER=1.0
|
|
|
86a5cc0 |
DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
|
|
|
86a5cc0 |
@@ -96,7 +96,7 @@
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
python_ltlib = _Hamlib.la
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
-pythondir = $(prefix)/lib/python
|
|
|
86a5cc0 |
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
|
|
|
86a5cc0 |
|
|
|
86a5cc0 |
nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c
|
|
|
86a5cc0 |
_Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version
|