rpms/hamlib/devel hamlib-1.2.9-bindings.patch,NONE,1.1

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26220

Added Files:
	hamlib-1.2.9-bindings.patch 
Log Message:
update patch

hamlib-1.2.9-bindings.patch:
 Makefile.am |    8 ++++----
 Makefile.in |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE hamlib-1.2.9-bindings.patch ---
diff -Naur hamlib-1.2.9/bindings/Makefile.in hamlib-1.2.9-mod/bindings/Makefile.in
--- hamlib-1.2.9/bindings/Makefile.in	2009-02-25 21:18:37.000000000 +0200
+++ hamlib-1.2.9-mod/bindings/Makefile.in	2009-08-19 08:07:17.000000000 +0300
@@ -268,7 +268,7 @@
 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@
 srcdir = @srcdir@
@@ -287,7 +287,7 @@
 ##########################################
 # 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
@@ -672,7 +672,7 @@
 			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
 
@@ -691,7 +691,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
 
diff -Naur hamlib-1.2.9/bindings/Makefile.am hamlib-1.2.9-mod/bindings/Makefile.am
--- hamlib-1.2.9/bindings/Makefile.am	2008-06-26 18:23:06.000000000 +0300
+++ hamlib-1.2.9-mod/bindings/Makefile.am	2009-08-19 08:06:17.000000000 +0300
@@ -29,7 +29,7 @@
 			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 @@
 	$(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 @@
 
 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 @@
 
 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