1 files changed, 30 insertions, 0 deletions
diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh
index fff8359..d789152 100644
--- a/chapter8/e2fsprogs.sh
+++ b/chapter8/e2fsprogs.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash
 set -e
 
@@ -24,3 +25,32 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info &&
 makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo &&
 install -v -m644 doc/com_err.info /usr/share/info &&
 install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info
+=======
+#!/bin/bash
+set -e
+
+mkdir -v build
+cd build || exit 1
+
+../configure --prefix=/usr \
+             --bindir=/bin \
+             --with-root-prefix="" \
+             --sysconfdir=/etc \
+             --enable-elf-shlibs \
+             --disable-libblkid \
+             --disable-libuuid \
+             --disable-uuidd \
+             --disable-fsck &&
+
+make &&
+
+make -j1 install &&
+
+rm -fv /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a &&
+gunzip -v /usr/share/info/libext2fs.info.gz &&
+install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info &&
+
+makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo &&
+install -v -m644 doc/com_err.info /usr/share/info &&
+install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28