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

This reverts r21246

svn: r21257
This commit is contained in:
John Ralls 2013-01-30 14:54:08 +00:00
parent 9b48321f9f
commit ef9464006e
2 changed files with 10 additions and 21 deletions

View File

@ -93,6 +93,12 @@ APP_GRAMPS_PKG = "application/x-gramps-package"
APP_GENEWEB = "application/x-geneweb" APP_GENEWEB = "application/x-geneweb"
APP_VCARD = ["text/x-vcard", "text/x-vcalendar"] APP_VCARD = ["text/x-vcard", "text/x-vcalendar"]
#-------------------------------------------------------------------------
#
# system paths
#
#-------------------------------------------------------------------------
LOCALE_DIR = "@LOCALE_DIR@"
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Platforms # Platforms
@ -199,23 +205,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")

View File

@ -183,10 +183,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>