gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Thu Nov 12 18:52:45 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/d751913c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4e91a33b (commit)
	from  https://github.com/Gnucash/gnucash/commit/a519b913 (commit)



commit d751913cb9d422be91595f42f89674248ffe90aa
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Nov 9 14:26:15 2020 -0800

    Fix typo in .gitattributes, text not test.

diff --git a/.gitattributes b/.gitattributes
index 75ddd56bc..15e143b3e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -23,7 +23,7 @@
 *.sh    text eol=lf
 *.svg   text eol=lf
 *.xsl   text eol=lf
-*.cmake test eol=lf
+*.cmake text eol=lf
 
 Makefile.TAGS    text eol=lf
 Makevars         text eol=lf

commit 4e91a33be358ac952ea31c2c62c816070c15b453
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Nov 9 13:50:51 2020 -0800

    Use LTDL_LIBRARY_PATH instead of (DY)LD_LIBRARY_PATH
    
    With GnuCash's main libraries now linked at startup instead of being
    dlopened at runtime except by Guile we can restrict the library path
    renaming to Gnu Libtool's environment variable.

diff --git a/gnucash/environment.in b/gnucash/environment.in
index e81a01325..3c03b74ee 100644
--- a/gnucash/environment.in
+++ b/gnucash/environment.in
@@ -64,10 +64,7 @@ GUILE_LOAD_PATH=@GNC_GUILE_LOAD_PATH@;{GUILE_LIBS};{GUILE_LOAD_PATH}
 GUILE_LOAD_COMPILED_PATH=@GNC_GUILE_LOAD_COMPILED_PATH@;{GUILE_COMPILED_LIBS};{GUILE_LOAD_COMPILED_PATH}
 
 # Tell Guile where to find GnuCash specific shared libraries
-GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
-LD_LIBRARY_PATH={GNC_LIBRARY_PATH};{LD_LIBRARY_PATH}
-# The same, but for GnuCash on OS X
-DYLD_LIBRARY_PATH={GNC_LIBRARY_PATH};{DYLD_LIBRARY_PATH}
+LTDL_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
 
 # For changing the language GnuCash uses, first refer to
 # to https://wiki.gnucash.org/wiki/Locale_Settings.



Summary of changes:
 .gitattributes         | 2 +-
 gnucash/environment.in | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)



More information about the gnucash-changes mailing list