[SCM] vamp-plugin-sdk/master: Fix merge.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a30dff95134df0dcd54262ab84c0b9f2b451c8c0
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Feb 27 14:09:16 2014 +0100

    Fix merge.

diff --git a/Makefile.in b/Makefile.in
index b1b6b60..6125cb7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,8 +41,6 @@ default:	@TARGETS@
 CC		= @CC@
 CXX		= @CXX@
 CXXFLAGS	= -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
-SUFFIX		:= $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-LIBDIR		?= lib$(SUFFIX)
 
 # ar, ranlib
 #
@@ -75,8 +73,8 @@ INSTALL_PREFIX	 	  = @prefix@
 INSTALL_API_HEADERS	  = $(INSTALL_PREFIX)/include/vamp
 INSTALL_SDK_HEADERS	  = $(INSTALL_PREFIX)/include/vamp-sdk
 INSTALL_HOSTSDK_HEADERS	  = $(INSTALL_PREFIX)/include/vamp-hostsdk
-INSTALL_SDK_LIBS	  = $(INSTALL_PREFIX)/$(LIBDIR)
-INSTALL_PLUGINS		  = $(INSTALL_PREFIX)/$(LIBDIR)/vamp
+INSTALL_SDK_LIBS	  = $(INSTALL_PREFIX)/lib
+INSTALL_PLUGINS		  = $(INSTALL_PREFIX)/lib/vamp
 INSTALL_BINARIES	  = $(INSTALL_PREFIX)/bin 
 
 INSTALL_SDK_LIBNAME	  = libvamp-sdk.so.2.5.0
@@ -91,7 +89,7 @@ INSTALL_HOSTSDK_LINK_DEV  = libvamp-hostsdk.so
 INSTALL_HOSTSDK_STATIC    = libvamp-hostsdk.a
 INSTALL_HOSTSDK_LA        = libvamp-hostsdk.la
 
-INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/$(LIBDIR)/pkgconfig
+INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/lib/pkgconfig
 
 # Flags required to tell the compiler to create a dynamically loadable object
 #
diff --git a/pkgconfig/vamp-hostsdk.pc.in b/pkgconfig/vamp-hostsdk.pc.in
index 844c8a1..7a00be4 100644
--- a/pkgconfig/vamp-hostsdk.pc.in
+++ b/pkgconfig/vamp-hostsdk.pc.in
@@ -1,6 +1,6 @@
 prefix=%PREFIX%
 exec_prefix=${prefix}
-libdir=${prefix}%LIBDIR%
+libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: vamp-hostsdk
diff --git a/pkgconfig/vamp-sdk.pc.in b/pkgconfig/vamp-sdk.pc.in
index 523c71f..554ef24 100644
--- a/pkgconfig/vamp-sdk.pc.in
+++ b/pkgconfig/vamp-sdk.pc.in
@@ -1,6 +1,6 @@
 prefix=%PREFIX%
 exec_prefix=${prefix}
-libdir=${prefix}%LIBDIR%
+libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: vamp-sdk

-- 
vamp-plugin-sdk packaging