87 lines
3 KiB
Diff
87 lines
3 KiB
Diff
Patch by Ralf Corsepius <rc040203@freenet.de> for unicap >= 0.2.19, which causes the use
|
|
of /usr/lib64 on 64 bit architectures. And without this patch, /usr/lib is always used.
|
|
|
|
--- unicap-0.2.19/cpi/dcam/Makefile.am 2007-08-02 22:29:53.000000000 +0200
|
|
+++ unicap-0.2.19/cpi/dcam/Makefile.am.libdir 2008-02-05 11:35:57.000000000 +0100
|
|
@@ -4,10 +4,10 @@
|
|
if ENABLE_STATIC_CPI
|
|
noinst_LTLIBRARIES = libdcam.la
|
|
else
|
|
-lib_LTLIBRARIES = libdcam.la
|
|
+libcpi_LTLIBRARIES = libdcam.la
|
|
endif
|
|
|
|
-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
|
|
+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
|
|
|
|
libdcam_la_CPPFLAGS = -D@LIBRAW1394_VERSION@
|
|
|
|
--- unicap-0.2.19/cpi/thing/Makefile.am 2006-04-16 22:02:55.000000000 +0200
|
|
+++ unicap-0.2.19/cpi/thing/Makefile.am.libdir 2008-02-05 11:36:58.000000000 +0100
|
|
@@ -1,9 +1,9 @@
|
|
MAINTAINERCLEANFILES = Makefile.in
|
|
INCLUDES = -I../include -I../../include
|
|
|
|
-lib_LTLIBRARIES = libthing.la
|
|
+libcpi_LTLIBRARIES = libthing.la
|
|
|
|
-libdir = $(prefix)/lib/unicap/cpi
|
|
+libcpidir = $(libdir)/unicap/cpi
|
|
|
|
|
|
libthing_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
|
|
--- unicap-0.2.19/cpi/v4l/Makefile.am 2007-08-02 22:30:32.000000000 +0200
|
|
+++ unicap-0.2.19/cpi/v4l/Makefile.am.libdir 2008-02-05 11:37:23.000000000 +0100
|
|
@@ -4,10 +4,10 @@
|
|
if ENABLE_STATIC_CPI
|
|
noinst_LTLIBRARIES = libv4l.la
|
|
else
|
|
-lib_LTLIBRARIES = libv4l.la
|
|
+libcpi_LTLIBRARIES = libv4l.la
|
|
endif
|
|
|
|
-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
|
|
+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
|
|
|
|
|
|
libv4l_la_LDFLAGS =
|
|
--- unicap-0.2.19/cpi/v4l2/Makefile.am 2008-02-02 16:07:46.000000000 +0100
|
|
+++ unicap-0.2.19/cpi/v4l2/Makefile.am.libdir 2008-02-05 11:36:25.000000000 +0100
|
|
@@ -4,10 +4,10 @@
|
|
if ENABLE_STATIC_CPI
|
|
noinst_LTLIBRARIES = libv4l2.la
|
|
else
|
|
-lib_LTLIBRARIES = libv4l2.la
|
|
+libcpi_LTLIBRARIES = libv4l2.la
|
|
endif
|
|
|
|
-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
|
|
+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
|
|
|
|
|
|
libv4l2_la_LDFLAGS =
|
|
--- unicap-0.2.19/cpi/vid21394/Makefile.am 2007-08-02 22:29:34.000000000 +0200
|
|
+++ unicap-0.2.19/cpi/vid21394/Makefile.am.libdir 2008-02-05 11:38:19.000000000 +0100
|
|
@@ -4,10 +4,10 @@
|
|
if ENABLE_STATIC_CPI
|
|
noinst_LTLIBRARIES = libvid21394.la
|
|
else
|
|
-lib_LTLIBRARIES = libvid21394.la
|
|
+libcpi_LTLIBRARIES = libvid21394.la
|
|
endif
|
|
|
|
-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi
|
|
+libcpidir = $(libdir)/unicap$(pkg_version)/cpi
|
|
|
|
libvid21394_la_LDFLAGS =
|
|
|
|
--- unicap-0.2.19/libunicapgtk/Makefile.am 2007-08-30 07:55:42.000000000 +0200
|
|
+++ unicap-0.2.19/libunicapgtk/Makefile.am.libdir 2008-02-05 11:39:08.000000000 +0100
|
|
@@ -1,6 +1,6 @@
|
|
MAINTAINERCLEANFILES = Makefile.in
|
|
INCLUDES = -I../include -I../libucil @GTK_PACKAGE_CFLAGS@
|
|
-AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(prefix)/lib/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\""
|
|
+AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(libdir)/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\""
|
|
|
|
if BUILD_UNICAPGTK
|
|
UNICAPGTK_LIB=libunicapgtk.la
|