Fix regression when loading a LassoServer from dump.
Fix an error with -rpath setting in last commit, -rpath must always be absolute paths.
This commit is contained in:
parent
dd0e7143ee
commit
24430806e6
|
@ -723,7 +723,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *path)
|
|||
if (doc == NULL)
|
||||
return FALSE;
|
||||
ret = lasso_provider_load_metadata_from_doc(provider, doc);
|
||||
if (ret == 0) {
|
||||
if (ret == TRUE) {
|
||||
lasso_assign_string(provider->metadata_filename, path);
|
||||
}
|
||||
lasso_release_doc(doc);
|
||||
|
|
|
@ -18,11 +18,11 @@ tests_LDADD = \
|
|||
$(top_builddir)/lasso/liblasso.la \
|
||||
$(LASSO_LIBS) \
|
||||
$(CHECK_LIBS)
|
||||
tests_LDFLAGS = -rpath $(top_srcdir)/lasso/.libs/
|
||||
tests_LDFLAGS = -rpath `cd $(top_srcdir)/lasso/.libs/; pwd`
|
||||
|
||||
perfs_SOURCES = perfs.c
|
||||
perfs_LDADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
|
||||
perfs_LDFLAGS = -rpath $(top_srcdir)/lasso/.libs/
|
||||
perfs_LDFLAGS = -rpath `cd $(top_srcdir)/lasso/.libs/; pwd`
|
||||
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue