merge in master-release history after reset to 2079d768f79f636223d89b988a30209adf8dddbe

[android-x86/external-e2fsprogs.git] / depfix.sed

diff --git a/depfix.sed b/depfix.sed
index 1bcf112..582d79f 100644 (file)
--- a/depfix.sed
+++ b/depfix.sed
@@ -11,20 +11,22 @@
 #
 # Remove line continuations....
 #
-#:FIRST
-#y/    / /
-#s/^ *//
-#/\\$/{
-#N
-#y/    / /
-#s/\\\n */ /
-#bFIRST
-#}
-#s/  */ /g
+:FIRST
+y/     / /
+s/^ *//
+/\\$/{
+N
+y/     / /
+s/\\\n */ /
+bFIRST
+}
+s/  */ /g
 
 s;/usr/include/[^ ]* *;;g
 s;/usr/lib/[^ ]* *;;g
 s;/mit/cygnus[^ ]* *;;g
+s;\.\./[^ ]*lib/blkid/blkid[^ ]* *;;g
+s;\.\./[^ ]*lib/uuid/uuid.h[^ ]* *;;g
 
 #
 # Now insert a trailing newline...