Revert "[r21246]Allow hard-coded paths to be overridden with $XDG_DATA_DIRS"

This reverts r21247

svn: r21256
This commit is contained in:
John Ralls 2013-01-30 14:51:52 +00:00
parent 54034d4811
commit 17f938c978
2 changed files with 4 additions and 21 deletions

View File

@ -200,23 +200,10 @@ else:
# Paths to data files.
#
#-------------------------------------------------------------------------
if "XDG_DATA_DIRS" in os.environ:
share = None
for path in os.environ["XDG_DATA_DIRS"].split(":"):
if os.path.exists(os.path.join(path, "gramps", "tips.xml")):
share = path
break
if not share:
share = os.path.split("@DATA_DIR@")[0]
LOCALE_DIR = os.path.join(share, "locale")
DATA_DIR = os.path.join(share, "gramps")
IMAGE_DIR = os.path.join(DATA_DIR, "icons", "hicolor")
DOC_DIR = os.path.join(share, "doc", "gramps")
else:
LOCALE_DIR = "@LOCALE_DIR@"
DATA_DIR = "@DATA_DIR@"
IMAGE_DIR = "@IMAGE_DIR@"
DOC_DIR = "@DOC_DIR@"
LOCALE_DIR = "@LOCALE_DIR@"
DATA_DIR = "@DATA_DIR@"
IMAGE_DIR = "@IMAGE_DIR@"
DOC_DIR = "@DOC_DIR@"
TIP_DATA = os.path.join(DATA_DIR, "tips.xml")
PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml")

View File

@ -187,10 +187,6 @@
${prefix}/lib/graphviz/config6
</data>
<data>
${prefix}/share/gramps
</data>
<!-- Copy in the themes data. You may want to trim this to save space
in your bundle. -->
<data>