Kaydet (Commit) 1e868bd1 authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

Birkaç adet düzenleme yapıldı.

inarytools için eksik olan bir detay eklendi. cmaketools emul paketleme sırasında oluşan hata giderildi. Sadece sulin için /usr/lib/sulin default prefix yapıldı.
üst 0b4ed286
...@@ -66,8 +66,8 @@ def configure(parameters='', installPrefix='/{}'.format(get.defaultprefixDIR()), ...@@ -66,8 +66,8 @@ def configure(parameters='', installPrefix='/{}'.format(get.defaultprefixDIR()),
if can_access_file(join_path(sourceDir, 'CMakeLists.txt')): if can_access_file(join_path(sourceDir, 'CMakeLists.txt')):
args = 'cmake -DCMAKE_INSTALL_PREFIX={0} \ args = 'cmake -DCMAKE_INSTALL_PREFIX={0} \
-DCMAKE_INSTALL_LIBDIR={1} \ -DCMAKE_INSTALL_LIBDIR={1} \
-DCMAKE_C_FLAGS="{2}" \ -DCMAKE_C_FLAGS="{7} {2}" \
-DCMAKE_CXX_FLAGS="{3}" \ -DCMAKE_CXX_FLAGS="{7} {3}" \
-DCMAKE_LD_FLAGS="{4}" \ -DCMAKE_LD_FLAGS="{4}" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo {5} {6}'.format(installPrefix, -DCMAKE_BUILD_TYPE=RelWithDebInfo {5} {6}'.format(installPrefix,
"/usr/lib32 " if get.buildTYPE() == "emul32" else "/usr/lib", "/usr/lib32 " if get.buildTYPE() == "emul32" else "/usr/lib",
...@@ -75,7 +75,8 @@ def configure(parameters='', installPrefix='/{}'.format(get.defaultprefixDIR()), ...@@ -75,7 +75,8 @@ def configure(parameters='', installPrefix='/{}'.format(get.defaultprefixDIR()),
get.CXXFLAGS(), get.CXXFLAGS(),
get.LDFLAGS(), get.LDFLAGS(),
parameters, parameters,
sourceDir) sourceDir,
"-m32" if get.buildTYPE() == "emul32" else "-m64")
if system(args): if system(args):
raise ConfigureError(_('Configure failed.')) raise ConfigureError(_('Configure failed.'))
......
...@@ -179,7 +179,7 @@ def dolib(sourceFile, destinationDirectory='/usr/lib', mode=755): ...@@ -179,7 +179,7 @@ def dolib(sourceFile, destinationDirectory='/usr/lib', mode=755):
lib_insinto(sourceFile, destinationDirectory, mode) lib_insinto(sourceFile, destinationDirectory, mode)
def doman(*sourceFiles): def doman(*sourceFiles, pageDirectory=None):
"""inserts the man pages in the list of files into /usr/share/man/""" """inserts the man pages in the list of files into /usr/share/man/"""
'''example call: inarytools.doman("man.1", "sulin.*")''' '''example call: inarytools.doman("man.1", "sulin.*")'''
...@@ -197,8 +197,9 @@ def doman(*sourceFiles): ...@@ -197,8 +197,9 @@ def doman(*sourceFiles):
if compressed: if compressed:
source = source[:-3] source = source[:-3]
try: try:
pageName, pageDirectory = source[:source.rindex('.')], \ if not pageDirectory:
source[source.rindex('.') + 1:] pageName, pageDirectory = source[:source.rindex('.')], \
source[source.rindex('.') + 1:]
except ValueError: except ValueError:
error(_('ActionsAPI [doman]: Wrong man page file: \"{}\"').format(source)) error(_('ActionsAPI [doman]: Wrong man page file: \"{}\"').format(source))
......
...@@ -106,6 +106,13 @@ class Install(install): ...@@ -106,6 +106,13 @@ class Install(install):
self.installi18n() self.installi18n()
# self.installdoc() # self.installdoc()
self.generateConfigFile() self.generateConfigFile()
def finalize_options(self):
# NOTE: for Sulin distribution
if os.path.exists("/etc/sulin-release"):
self.install_platlib = '$base/lib/sulin'
self.install_purelib = '$base/lib/sulin'
install.finalize_options(self)
def installi18n(self): def installi18n(self):
for name in os.listdir('po'): for name in os.listdir('po'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment