diff --git a/in/wicd=wpath.py.in b/in/wicd=wpath.py.in index 985874f..838a5c7 100755 --- a/in/wicd=wpath.py.in +++ b/in/wicd=wpath.py.in @@ -30,6 +30,7 @@ log = '%LOG%' resume = '%RESUME%' suspend = '%SUSPEND%' sbin = '%SBIN%' +pmutils = '%PMUTILS%' dbus = '%DBUS%' desktop = '%DESKTOP%' backends= '%BACKENDS%' @@ -53,7 +54,7 @@ initfile = '%INITFILE%' initfilename = '%INITFILENAME%' # BOOLEANS - +no_install_pmutils = %NO_INSTALL_PMUTILS% no_install_init = %NO_INSTALL_INIT% no_install_man = %NO_INSTALL_MAN% no_install_kde = %NO_INSTALL_KDE% diff --git a/setup.py b/setup.py index 76a5e47..521e7dd 100755 --- a/setup.py +++ b/setup.py @@ -341,7 +341,8 @@ try: print short_language, data.append((wpath.translations + short_language + '/LC_MESSAGES/', ['translations/' + language + '/LC_MESSAGES/wicd.mo'])) print -except: +except Exception, e: + print str(e) print '''Error setting up data array. This is normal if python setup.py configure has not yet been run.''' diff --git a/wicd/wpath.py b/wicd/wpath.py index 6dbedc8..6afec6c 100755 --- a/wicd/wpath.py +++ b/wicd/wpath.py @@ -30,6 +30,7 @@ log = '/var/log/wicd/' resume = '/etc/acpi/resume.d/' suspend = '/etc/acpi/suspend.d/' sbin = '/usr/sbin/' +pmutils = '/usr/lib/pm-utils/sleep.d/' dbus = '/etc/dbus-1/system.d/' desktop = '/usr/share/applications/' backends= '/usr/lib/wicd/backends/' @@ -53,7 +54,7 @@ initfile = 'init/debian/wicd' initfilename = 'wicd' # BOOLEANS - +no_install_pmutils = False no_install_init = False no_install_man = False no_install_kde = False