3 files changed, 17 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index cdb887a..ada0251 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 pythondir = $(pkgdatadir)
 python_DATA = $(PACKAGE).py
 
-EXTRA_DIST = $(python_DATA) $(desktop_in_files) $(ui_DATA)
+EXTRA_DIST = $(python_DATA) $(desktop_in_files) $(ui_DATA) $(bin_SCRIPTS_IN)
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/src/ppm/Makefile.am b/src/ppm/Makefile.am
index 7649cbb..8346110 100644
--- a/src/ppm/Makefile.am
+++ b/src/ppm/Makefile.am
@@ -4,6 +4,7 @@ pythondir = $(pkgdatadir)/ppm/
 python_DATA_IN = __init__.py.in
 python_DATA = \
 		__init__.py	\
+		accountdb.py	\
 		modemproxy.py	\
 		provider.py	\
 		providerdb.py	\
@@ -12,7 +13,7 @@ python_DATA = \
 
 EXTRA_DIST = $(python_DATA) $(python_DATA_IN)
 
-%.py: $(srcdir)/%.py.in
+%.py: $(srcdir)/%.py.in $(srcdir)/Makefile
 	sed -e "s,::PACKAGE::,$(PACKAGE)," \
 	  -e "s,::PYLIBDIR::,$(pkgdatadir)," \
 	  -e "s,::GETTEXTDIR::,$(datadir)/locale," \
diff --git a/src/prepaid-manager-applet.py b/src/prepaid-manager-applet.py
index 66f3609..77de3ed 100755
--- a/src/prepaid-manager-applet.py
+++ b/src/prepaid-manager-applet.py
@@ -27,6 +27,7 @@ from gi.repository import Gtk
 import locale
 import logging
 import os
+import sys
 import time
 
 import ppm
@@ -635,8 +636,18 @@ def setup_schemas():
         os.environ["GSETTINGS_SCHEMA_DIR"] = "data"
 
 
-def main():
-    logging.basicConfig(level=logging.DEBUG,
+def main(args):
+    parser = glib.option.OptionParser()
+    parser.add_option("--debug", "-d", action="store_true", dest="debug",
+                      help="enable debugging", default=False)
+    options, args = parser.parse_args()
+
+    if options.debug:
+        log_level = logging.DEBUG
+    else:
+        log_level = logging.INFO
+
+    logging.basicConfig(level=log_level,
                         format='ppm: %(levelname)s: %(message)s')
 
     setup_schemas()
@@ -651,7 +662,7 @@ def main():
 
 if __name__ == "__main__":
     try:
-        main()
+        main(sys.argv)
     except KeyboardInterrupt:
         logging.debug("Received KeyboardInterrupt. Exiting application.")
     except SystemExit: