r23303 - gnucash/trunk/src/bin - Use the compile time value of XDG_DATA_DIRS to set the default run time value.

[Mike Alexander]

Author: mta
Date: 2013-10-19 23:34:20 -0400 (Sat, 19 Oct 2013)
New Revision: 23303
Trac: http://svn.gnucash.org/trac/changeset/23303

Modified:
   gnucash/trunk/src/bin/Makefile.am
Log:
Use the compile time value of XDG_DATA_DIRS to set the default run time value.

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2013-10-19 16:52:54 UTC (rev 23302)
+++ gnucash/trunk/src/bin/Makefile.am	2013-10-20 03:34:20 UTC (rev 23303)
@@ -75,13 +75,15 @@
 if CUSTOM_GNC_DBD_DIR
 	echo 'GNC_DBD_DIR=@GNC_DBD_DIR@' >> $@.tmp
 endif
+    # Set XDG_DATA_DIRS if necessary.  This is done in such a way that the value at
+    # run time overrieds the value at compile time which overrides the default value
 	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; \
+		echo "XDG_DATA_DIRS=$(prefix)/share:{XDG_DATA_DIRS}:$(XDG_DATA_DIRS):/usr/local/share/:/usr/share/" >> $@.tmp; \
 	fi
 	mv $@.tmp $@