Fix support for applying patches in merge2out

Now allows files in subdirectories to be patched.
puppylinux-woof-CE · Dec 26, 2016 · 422eca8 · 422eca8
1 parent 6a8e48e
commit 422eca8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/merge2out b/merge2out
@@ -196,7 +196,7 @@ if [ -d "woof-distro/${TARGETARCH}/${COMPATDISTRO}/${COMPATVERSION}/patches" ];t
 	`find woof-distro/${TARGETARCH}/${COMPATDISTRO}/${COMPATVERSION}/patches -mindepth 1 -maxdepth 1 -type f -iname '*.patch' | tr '\n' ' '`
 	do
 		echo "    $PATCHFILE"
-		patch --unified --forward --silent --input="../woof-CE/$PATCHFILE" --directory=${WOOF_OUT}
+		patch --unified --forward --silent -p 3 --input="../woof-CE/$PATCHFILE" --directory=${WOOF_OUT}
 	done
 fi