X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=boot.sh;fp=boot.sh;h=6a5ac53db622634ff67b9aeeae65356ed15e036f;hb=016e02cfe7714338aeff43c2c451e38d8c603489;hp=7c674c5079f7ae85c332a0db8745e011751773a2;hpb=3f43245fa5586a5ee1d4535e16bd3f02e7eb2678;p=sliver-openvswitch.git

diff --git a/boot.sh b/boot.sh
index 7c674c507..6a5ac53db 100755
--- a/boot.sh
+++ b/boot.sh
@@ -20,35 +20,22 @@ EOF
     esac
 done
 
-
 # Generate list of files in debian/ to distribute.
 (echo '# Automatically generated by boot.sh (from Git tree).' &&
  echo 'EXTRA_DIST += \' &&
  git ls-files debian | grep -v '^debian/\.gitignore$' | 
  sed -e 's/\(.*\)/	\1 \\/' -e '$s/ \\//') > debian/automake.mk
 
-# Find the "include ext/automake.mk" line in Makefile.am and comment
-# it out or in according to whether ext is available, and similarly
-# for "m4_include(ext/configure.m4)" in configure.ac.
-subst() {
-    perl -pe "$1" < "$2" > "$2.tmp"
-    if cmp -s "$2.tmp" "$2"; then
-	rm "$2.tmp"
-    else
-	mv "$2.tmp" "$2"
-    fi
-}
+# Enable or disable ext.
 if test "$have_ext" = yes; then
     echo 'Enabling openflowext...'
-    OC='#'
-    NC=
+    echo 'include ext/automake.mk' > ext.mk
+    echo 'm4_include([ext/configure.m4])' > ext.m4
 else
     echo 'Disabling openflowext...'
-    OC=
-    NC='#'
+    echo '# This file intentionally left blank.' > ext.mk
+    echo '# This file intentionally left blank.' > ext.m4
 fi
-subst "s|^$OC(include ext/automake\\.mk)\$|$NC\$1|" Makefile.am
-subst "s|^$OC(m4_include\\(ext/configure\.m4\\))\$|$NC\$1|" configure.ac
 
 # Bootstrap configure system from .ac/.am files
 autoreconf --install -I config --force