1 files changed, 24 insertions, 0 deletions
diff --git a/chapter8/python.sh b/chapter8/python.sh
index 230d4f6..fd7b1a6 100644
--- a/chapter8/python.sh
+++ b/chapter8/python.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash
 set -e
 
@@ -20,3 +21,26 @@ tar --strip-components=1  \
     --no-same-permissions \
     -C /usr/share/doc/python-"${VERSION}"/html \
     -xvf ../python-"${VERSION}"-docs-html.tar.bz2
+=======
+#!/bin/bash
+set -e
+
+./configure --prefix=/usr \
+            --enable-shared \
+            --with-system-expat \
+            --with-system-ffi \
+            --with-ensurepip=yes \
+	    --enable-optimizations &&
+
+make &&
+
+make -j1 install &&
+
+install -v -dm755 /usr/share/doc/python-"${VERSION}"/html &&
+
+tar --strip-components=1  \
+    --no-same-owner       \
+    --no-same-permissions \
+    -C /usr/share/doc/python-"${VERSION}"/html \
+    -xvf ../python-"${VERSION}"-docs-html.tar.bz2
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28