Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gramps/gen/const.py.in
View File

@ -200,23 +200,10 @@ else:
# Paths to data files. # Paths to data files.
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
if "XDG_DATA_DIRS" in os.environ: LOCALE_DIR = "@LOCALE_DIR@"
share = None DATA_DIR = "@DATA_DIR@"
for path in os.environ["XDG_DATA_DIRS"].split(":"): IMAGE_DIR = "@IMAGE_DIR@"
if os.path.exists(os.path.join(path, "gramps", "tips.xml")): DOC_DIR = "@DOC_DIR@"
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@"
TIP_DATA = os.path.join(DATA_DIR, "tips.xml") TIP_DATA = os.path.join(DATA_DIR, "tips.xml")
PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml") PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml")

4
mac/gramps.bundle
View File

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