How to write and apply patch.

[The DJ]

I have adapted samba-2.2.2 code to include the most important additions
apple made to samba-2.0.8 for OS X server.

Now I want to create a patch over the multiple files I have edited, but
everytime I try I can't seem to apply it. I only know how to create and
apply single file patches, so I'm probably doing something wrong. What do I
have to do create a patch and apply it?

I have to dirs now: samba-2.2.2 with the original code and samba-apple with
my code.

Diff -ruN samba-2.2.2 samba-apple > darwin.patch
Gives me a nice diff but everytime I apply it I get:

can't find file to patch at input line 4
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ruN samba-2.2.2/source/include/includes.h
samba-2.2.2-apple/source/include/includes.h
|--- samba-2.2.2/source/include/includes.h      Sat Oct 13 23:09:21 2001
|+++ samba-2.2.2-apple/source/include/includes.h        Wed Oct 24 12:07:30
2001
--------------------------
File to patch:

Any one care to help this beginner. I tried browsing the web, but google
gave a bit too many results ;-)
Does anyone have a site for me about the whole makefile, configure,
autoconf, patch bussiness? The man pages are quite difficult to figure out
with all that options they provide.

DJ
---------------------------------------------------------------------------
Universiteit Twente
---------------------------------------------------------------------------
Derk-Jan 'The DJ' Hartman
ICQnr: 10111559
Mail:  mailto:hartman at mac.com
WWW:   http://home.student.utwente.nl/d.hartman/
Goto:  http://www.student.utwente.nl/~macsatcampus