--- a/install.py	Wed Apr 04 19:49:10 2018 +0200
+++ b/install.py	Thu Apr 05 19:39:21 2018 +0200
@@ -302,6 +302,8 @@
     @param dst destination file name (string)
     @param marker marker to be used (string)
     """
+    global cfg
+    
     if sys.version_info[0] == 2:
         f = codecs.open(src, "r", "utf-8")
     else:
@@ -309,6 +311,7 @@
     text = f.read()
     f.close()
     
+    text = text.replace("@BINDIR@", cfg['bindir'])
     text = text.replace("@MARKER@", marker)
     if marker:
         t_marker = " ({0})".format(PythonTextMarkers[marker])
@@ -963,7 +966,8 @@
                 marker)
         elif os.getuid() >= 1000:
             # it is assumed, that user ids start at 1000
-            localPath = os.path.join(os.path.expanduser("~"), ".local")
+            localPath = os.path.join(os.path.expanduser("~"),
+                                     ".local", "share")
             # create directories first
             for directory in [os.path.join(localPath, name)
                               for name in ("pixmaps", "applications",