r23225 - gnucash/trunk/src/bin - Amend XDG_DATA_DIRS if not installed in default prefix

Geert Janssens gjanssens at code.gnucash.org
Mon Oct 7 10:07:15 EDT 2013


Author: gjanssens
Date: 2013-10-07 10:07:14 -0400 (Mon, 07 Oct 2013)
New Revision: 23225
Trac: http://svn.gnucash.org/trac/changeset/23225

Modified:
   gnucash/trunk/src/bin/Makefile.am
Log:
Amend XDG_DATA_DIRS if not installed in default prefix

This ensures gsettings schemas are properly found

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2013-10-07 14:07:00 UTC (rev 23224)
+++ gnucash/trunk/src/bin/Makefile.am	2013-10-07 14:07:14 UTC (rev 23225)
@@ -120,6 +120,14 @@
 if CUSTOM_GNC_DBD_DIR
 	echo 'GNC_DBD_DIR=@GNC_DBD_DIR@' >> $@.tmp
 endif
+	if [ "a$(prefix)" != "a/usr" ] && [ "a$(prefix)" != "a/usr/local" ]; \
+	then \
+		echo >> $@.tmp; \
+		echo "# GnuCash was not installed in the default location" >> $@.tmp; \
+		echo "# XDG_DATA_DIRS will be set so that our documentation" >> $@.tmp; \
+		echo "# and gsettings schemas are found." >> $@.tmp; \
+		echo "XDG_DATA_DIRS=$(prefix)/share:{XDG_DATA_DIRS}:/usr/local/share/:/usr/share/" >> $@.tmp; \
+	fi
 	mv $@.tmp $@
 
 CLEANFILES = $(BUILT_SOURCES) ${config_DATA} ${PLATFORM_FILES}



More information about the gnucash-changes mailing list