diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py
index 35be12c3..1b89479f 100644
--- a/pisi/actionsapi/autotools.py
+++ b/pisi/actionsapi/autotools.py
@@ -122,21 +122,22 @@ def install(parameters = '', argument = 'install'):
 
         if system(args):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
 
-    fixInfoDir()
 
 def rawInstall(parameters = '', argument = 'install'):
     '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()'''
     if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
         if system('make %s %s' % (parameters, argument)):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
 
-    fixInfoDir()
-
 def aclocal(parameters = ''):
     '''generates an aclocal.m4 based on the contents of configure.in.'''
     if system('aclocal %s' % parameters):
diff --git a/pisi/actionsapi/cmaketools.py b/pisi/actionsapi/cmaketools.py
index 2867d969..375bf492 100644
--- a/pisi/actionsapi/cmaketools.py
+++ b/pisi/actionsapi/cmaketools.py
@@ -98,17 +98,17 @@ def install(parameters = '', argument = 'install'):
 
         if system(args):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
 
-    fixInfoDir()
-
 def rawInstall(parameters = '', argument = 'install'):
     '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()'''
     if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
         if system('make %s %s' % (parameters, argument)):
             raise InstallError(_('Install failed.'))
+        else:
+            fixInfoDir()
     else:
         raise InstallError(_('No Makefile found.'))
-
-    fixInfoDir()