I am having the worst luck with this. Replacing the lines manually worked perfectly. I can compile and run my world on Linux no problem. Even made a few tweaks to make sure I was really getting it done right.
However, I cannot get this patch above to apply no matter what I do. Even taking just one simple thing (Makefile) and trying to patch gives me an error, thinking it's already been patched and wanting to -R it... but the file still has the extra MAKEs in it, so it's not already patched.
And, I was able to do the diff to re-make the patch the other night perfectly - following your diff example above (except on my Fedora, it says -u1 is obsolete and to use -u 1). Now, tonight, out of nowhere, I cannot even Diff anymore. Now it says my second dir is an extra operand lol... I give up.
Need sleep. I'll try again tomorrow.
|