Makefile fix

üst 8de9eafe
......@@ -18,6 +18,6 @@ pot:
build:
python3 setup.py build
install:
mkdir -p {DESTDIR}/usr/bin/ ${DESTDIR}/usr/lib/sulin || true
mkdir -p ${DESTDIR}/usr/bin/ ${DESTDIR}/usr/lib/sulin || true
python3 setup.py install --install-lib=${DESTDIR}/usr/lib/sulin --root=${DESTDIR} --install-scripts=${DESTDIR}/usr/bin
[ -f ${DESTDIR}/usr/bin/inary ] || ln -s inary-cli ${DESTDIR}/usr/bin/inary || true
......@@ -58,7 +58,7 @@ class Build(build):
build.run(self)
self.mkpath(self.build_base)
if getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge &>/dev/null"):
if getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge"):
for in_file in IN_FILES:
name, ext = os.path.splitext(in_file)
self.spawn(["intltool-merge", "-x", "po", in_file,
......@@ -67,7 +67,7 @@ class Build(build):
class BuildPo(build):
def run(self):
if getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge &>/dev/null"):
if getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge"):
build.run(self)
self.build_po()
......@@ -134,7 +134,7 @@ class Install(install):
install.finalize_options(self)
def installi18n(self):
if not getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge &>/dev/null"):
if not getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge"):
return
for name in os.listdir('po'):
if not name.endswith('.po'):
......@@ -226,7 +226,7 @@ setup(name="inary",
'install': Install,
'test': Test},
data_files=[(CONFIG_DIR, ["config/inary.conf", "config/mirrors.conf"]),
(MIMEFILE_DIR, ["build/inary.xml"] if getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge &>/dev/null") else [])],
(MIMEFILE_DIR, ["build/inary.xml"] if getConfig("NLS_SUPPORT") and 0 == os.system("which intltool-merge") else [])],
scripts=(['inary-cli',
'scripts/pspec2po',
'scripts/revdep-rebuild',
......
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