Revert mesonbuild#823, see also mesonbuild#830.

pbo-linaro · Oct 2, 2016 · c69c15e · c69c15e
1 parent 6ec1e99
commit c69c15e
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/meson.py b/meson.py
@@ -17,18 +17,11 @@
 from mesonbuild import mesonmain
 import sys, os
 
-def main():
-    thisfile = __file__
-    if not os.path.isabs(thisfile):
-        thisfile = os.path.normpath(os.path.join(os.getcwd(), thisfile))
-    if __package__ == '':
-        thisfile = os.path.dirname(thisfile)
-
-    # The first argument *must* be an absolute path because
-    # the user may have launched the program from a dir
-    # that is not in path.
-    sys.exit(mesonmain.run(thisfile, sys.argv[1:]))
-
-if __name__ == '__main__':
-    main()
-
+thisfile = __file__
+if not os.path.isabs(thisfile):
+    thisfile = os.path.normpath(os.path.join(os.getcwd(), thisfile))
+
+# The first argument *must* be an absolute path because
+# the user may have launched the program from a dir
+# that is not in path.
+sys.exit(mesonmain.run(thisfile, sys.argv[1:]))