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

Add LOCALE_DIR. Remove PREFIXDIR and SYSCONFDIR.

Browse Source 
svn: r20866
This commit is contained in:
Nick Hall 2012-12-28 19:59:07 +00:00
parent af456e12b7
commit f055e2748e
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,19 +89,7 @@ APP_VCARD = ["text/x-vcard", "text/x-vcalendar"]
# system paths # system paths
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
if sys.platform == "win32": LOCALE_DIR = "@LOCALE_DIR@"
if sys.prefix == os.path.dirname(os.getcwd()):
PREFIXDIR = sys.prefix
SYSCONFDIR = os.path.join(sys.prefix, "etc")
else:
PREFIXDIR = os.path.join(os.path.dirname(__file__), os.pardir)
SYSCONFDIR = os.path.join(PREFIXDIR, "etc")
elif sys.platform == "darwin" and sys.prefix != sys.exec_prefix:
PREFIXDIR = sys.prefix
SYSCONFDIR = os.path.join(sys.prefix, "etc")
else:
PREFIXDIR = "@prefix@"
SYSCONFDIR = "@sysconfdir@"
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

16
setup.py
View File

@ -231,24 +231,24 @@ def write_gramps_script(install_cmd, build_scripts):
log.info('changing mode of %s to %o', filename, mode) log.info('changing mode of %s to %o', filename, mode)
os.chmod(filename, mode) os.chmod(filename, mode)
def write_const_py(install_cmd): def write_const_py(command):
''' '''
Write the const.py file. Write the const.py file.
''' '''
const_py_in = os.path.join('gramps', 'gen', 'const.py.in') const_py_in = os.path.join('gramps', 'gen', 'const.py.in')
const_py = os.path.join('gramps', 'gen', 'const.py') const_py = os.path.join('gramps', 'gen', 'const.py')
if hasattr(install_cmd, 'install_data'): if hasattr(command, 'install_data'):
#during install #during install
prefix = "'%s'" % install_cmd.install_data locale_dir = os.path.join(command.install_data, 'share', 'locale')
sysconfdir = "'%s'" % os.path.join(install_cmd.install_data, 'etc') # Is this correct?
else: else:
#in build #in build
prefix = 'os.path.join(os.path.dirname(__file__), os.pardir)' if os.access(const_py, os.F_OK):
sysconfdir = prefix + ' + "' + os.sep + 'etc"' # Is this correct? # Prevent overwriting version created during install
return
locale_dir = os.path.join(command.build_base, 'mo')
subst_vars = (('@VERSIONSTRING@', VERSION), subst_vars = (('@VERSIONSTRING@', VERSION),
('"@prefix@"', prefix), ('@LOCALE_DIR@', locale_dir))
('"@sysconfdir@"', sysconfdir))
substitute_variables(const_py_in, const_py, subst_vars) substitute_variables(const_py_in, const_py, subst_vars)