Bug 1144086 - Move extension docs assembly from makedocs.pl to conf.py. r=dkl,a=glob

diff --git a/docs/en/rst/conf.py b/docs/en/rst/conf.py
index c8be24e49a6444b1b3c606c778527f4e4e61e5f3..a5c6090e9f9748cb87a4f5779cb4454c4b4bb0e4 100644 (file)
--- a/docs/en/rst/conf.py
+++ b/docs/en/rst/conf.py
@@ -400,6 +400,10 @@ ext_dir = "../../../extensions"
 if (os.path.isdir(ext_dir)):
     # Clear out old extensions docs
     for dir in os.listdir("extensions"):
+        # A .gitignore file is required as git doesn't like empty directories
+        if dir == ".gitignore":
+            continue
+
         shutil.rmtree(os.path.join("extensions", dir))
 
     # Copy in new copies