Those given parameters are nonsense and noop. Just give DESTDIR to install() for correct installation into sandbox.

This commit is contained in:
Ozan Çağlayan
2010-03-08 12:57:42 +00:00
parent ab8ea0bf21
commit ca28553a27
2 changed files with 17 additions and 17 deletions
+7
View File
@@ -1,10 +1,17 @@
2010-03-08 Ozan Çağlayan <ozan@pardus.org.tr>
* pisi/actionsapi/cmaketools.py: Those given parameters are nonsense
and noop. Just give DESTDIR to install() for correct installation into
sandbox.
2010-03-03 Fatih Aşıcı <fatih@pardus.org.tr>
* pisi/operations/build.py: Fix concatenation error. This is a
regression introduced when the support for Source/AdditionalFile
support is added.
2010-03-01 Ozan Çağlayan <ozan@pardus.org.tr>
* pisi/: Use the constants from constants.py instead of hardcoding
them.
2010-02-28 Fatih Aşıcı <fatih@pardus.org.tr>
* pisi/atomicoperations.py: Check if the old and new paths
refer to the same file when relocating or cleaning up. Also
+10 -17
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2005 - 2007, TUBITAK/UEKAE
# Copyright (C) 2005-2010 TUBITAK/UEKAE
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
@@ -88,22 +88,15 @@ def fixInfoDir():
def install(parameters = '', argument = 'install'):
'''install source into install directory with given parameters'''
if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
args = 'make prefix=%(prefix)s/%(defaultprefix)s \
datadir=%(prefix)s/%(data)s \
infodir=%(prefix)s/%(info)s \
localstatedir=%(prefix)s/%(localstate)s \
mandir=%(prefix)s/%(man)s \
sysconfdir=%(prefix)s/%(conf)s \
%(parameters)s \
%(argument)s' % {'prefix': get.installDIR(),
'defaultprefix': get.defaultprefixDIR(),
'man': get.manDIR(),
'info': get.infoDIR(),
'localstate': get.localstateDIR(),
'conf': get.confDIR(),
'data': get.dataDIR(),
'parameters': parameters,
'argument':argument}
# You can't squeeze unix paths with things like 'bindir', 'datadir', etc with CMake
# http://public.kitware.com/pipermail/cmake/2006-August/010748.html
args = 'make DESTDIR="%(destdir)s" \
%(parameters)s \
%(argument)s' % {
'destdir' : get.installDIR(),
'parameters' : parameters,
'argument' : argument,
}
if system(args):
raise InstallError(_('Install failed.'))