From e111cad664b686ecc12aa745e999c3453aa96d0e Mon Sep 17 00:00:00 2001 From: aneejit1 Date: Mon, 22 Jun 2020 21:54:26 +0000 Subject: Use $(libdir) rather than $(prefix)/lib to prevent multi-arch build issues Signed-off-by: aneejit1 --- xparts/src/gtk/Makefile.am | 2 +- xparts/xpart_notepad/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xparts/src/gtk/Makefile.am b/xparts/src/gtk/Makefile.am index 839e43db..942b244e 100644 --- a/xparts/src/gtk/Makefile.am +++ b/xparts/src/gtk/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = libgtkxparts.la libgtkxparts_la_SOURCES = gtkpart.c gtkbrowserextension.c libgtkxparts_la_LIBADD = $(GTK2_LIBS) $(GLIB2_LIBS) $(top_builddir)/dcopc/libdcopc.la -libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined +libgtkxparts_la_LDFLAGS = -L$(libdir) $(all_libraries) -no-undefined gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h gtkxpartsincludedir = $(includedir)/xtdeparts diff --git a/xparts/xpart_notepad/Makefile.am b/xparts/xpart_notepad/Makefile.am index 5916508b..bdc05f85 100644 --- a/xparts/xpart_notepad/Makefile.am +++ b/xparts/xpart_notepad/Makefile.am @@ -10,7 +10,7 @@ xparthost_DIR=$(srcdir)/../src/interfaces xp_notepad_SOURCES = xp_notepad.cpp xpart.skel xparthost.stub xp_notepad_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP ../src/tde/libtdexparts.la #xp_notepad_LDFLAGS = -L$(prefix)/lib -lxpcom $(all_libraries) -xp_notepad_LDFLAGS = -L$(prefix)/lib $(all_libraries) +xp_notepad_LDFLAGS = -L$(libdir) $(all_libraries) shell_xparthost_SOURCES = shell_xparthost.cpp shell_xparthost_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) $(top_builddir)/xparts/src/tde/libtdexparts.la -- cgit v1.2.1