Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actionsapi/cmaketools: Remove Makefile check from cmaketools.install

Browse Source 
Developer may add '-C dir' parameter, so we should take this into account.
This commit is contained in:
Gökçen Eraslan
2010-08-16 07:04:54 +00:00
parent 057ea2934a
commit 27ad54bc7b
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/actionsapi/cmaketools.py
-3
View File
@@ -84,7 +84,6 @@ def fixInfoDir():
def install(parameters = '', argument = 'install'): def install(parameters = '', argument = 'install'):
'''install source into install directory with given parameters''' '''install source into install directory with given parameters'''
if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
# You can't squeeze unix paths with things like 'bindir', 'datadir', etc with CMake # You can't squeeze unix paths with things like 'bindir', 'datadir', etc with CMake
# http://public.kitware.com/pipermail/cmake/2006-August/010748.html # http://public.kitware.com/pipermail/cmake/2006-August/010748.html
args = 'make DESTDIR="%(destdir)s" \ args = 'make DESTDIR="%(destdir)s" \
@@ -99,8 +98,6 @@ def install(parameters = '', argument = 'install'):
raise InstallError(_('Install failed.')) raise InstallError(_('Install failed.'))
else: else:
fixInfoDir() fixInfoDir()
else:
raise InstallError(_('No Makefile found.'))
def rawInstall(parameters = '', argument = 'install'): def rawInstall(parameters = '', argument = 'install'):
'''install source into install directory with given parameters = PREFIX=%s % get.installDIR()''' '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()'''