From adb3df6feb6fd41b24668e47927da976c23ab3dd Mon Sep 17 00:00:00 2001 From: Steve Conklin Date: Aug 27 2008 02:26:49 +0000 Subject: Added patch file to cvs --- diff --git a/hamlib-bindings-1.2.7.patch b/hamlib-bindings-1.2.7.patch new file mode 100644 index 0000000..592ad85 --- /dev/null +++ b/hamlib-bindings-1.2.7.patch @@ -0,0 +1,64 @@ +--- hamlib-1.2.7/bindings/Makefile.in 2008-02-14 01:03:46.000000000 +0200 ++++ hamlib-1.2.7-mod/bindings/Makefile.in 2008-08-26 22:04:23.000000000 +0300 +@@ -274,7 +274,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@ + subdirs = @subdirs@ +@@ -668,7 +668,10 @@ + CC="$(CC)" \ + OBJECT="hamlibperl_wrap.o" \ + VERSION="$(PACKAGE_VERSION)" \ +- 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 + + all-perl: Hamlib-pl.mk hamlibperl_wrap.c + $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk all +@@ -685,7 +688,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 + +--- hamlib-1.2.7/bindings/Makefile.am 2007-11-27 21:55:19.000000000 +0200 ++++ hamlib-1.2.7-mod/bindings/Makefile.am 2008-08-26 21:49:34.000000000 +0300 +@@ -25,7 +25,10 @@ + CC="$(CC)" \ + OBJECT="hamlibperl_wrap.o" \ + VERSION="$(PACKAGE_VERSION)" \ +- 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 + + all-perl: Hamlib-pl.mk hamlibperl_wrap.c + $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk all +@@ -43,7 +46,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. +@@ -90,7 +93,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