---
 src/Makefile.inc.am        |   16 ++++++++++++----
 src/python/Makefile.inc.am |    2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

--- a/src/Makefile.inc.am
+++ b/src/Makefile.inc.am
@@ -1,6 +1,6 @@
 ## -*- mode: makefile -*-
 
-noinst_LTLIBRARIES += lib_otf2.la
+#noinst_LTLIBRARIES += lib_otf2.la
 lib_otf2_la_LDFLAGS =
 lib_otf2_la_SOURCES = \
     $(PUBLIC_INC_SRC)otf2.h \
@@ -169,7 +169,7 @@ common_lib_ldflags += $(OTF2_SIONLIB_LDF
 common_lib_libadd  += $(OTF2_SIONLIB_LIBS)
 endif
 
-lib_LTLIBRARIES += libopen_trace_format2.la
+#lib_LTLIBRARIES += libopen_trace_format2.la
 libopen_trace_format2_la_LDFLAGS = \
     $(common_lib_ldflags) \
     -version-info @LIBRARY_INTERFACE_VERSION@
@@ -182,8 +182,16 @@ libopen_trace_format2_la_LIBADD = \
 	ln -sf libopen_trace_format2.a $@
 .libs/libotf2.so: libopen_trace_format2.la
 	ln -sf libopen_trace_format2.so $@
-libotf2.la: .libs/libotf2.so .libs/libotf2.a
-	echo -e "# Generated by libtool\nlibrary_names='libotf2.so'\ninstalled=no\nlibdir='/usr/lib/$(DEB_HOST_MULTIARCH)'\n" > $@
+libotf2.la:
+	ln -sf /usr/lib/*/libopen_trace_format2.so .
+	ln -sf /usr/lib/*/libopen_trace_format2.a .
+	( \
+		echo "# Generated by libtool" ; \
+		echo "library_names='libopen_trace_format2.so'" ; \
+		echo "old_library='libopen_trace_format2.a'" ; \
+		echo "installed=yes" ; \
+		echo "libdir=$$PWD" \
+	) > $@
 
 all-local: libotf2.la
 
--- a/src/python/Makefile.inc.am
+++ b/src/python/Makefile.inc.am
@@ -67,7 +67,7 @@ otf2python_python = $(SRC_ROOT)src/pytho
 if HAVE_PYTHON_BINDINGS_SUPPORT
 
 _otf2pythondir = $(pythondir)/_otf2
-_otf2python_LTLIBRARIES = _otf2.la
+#_otf2python_LTLIBRARIES = _otf2.la
 _otf2_la_LDFLAGS = \
     $(common_lib_ldflags) \
     -shared \
