how to write a patch and how to integrate it in PKGBUILD

zeppelin · 2004-05-01 23:36:04

I have a file [yes it's a Makefile]
with this idiot line:
CFLAGS += '-DGLADEDIR="data"'

I want it replaced to

CFLAGS += '-DGLADEDIR="/usr/local/share/de-jong-explorer/data"'

how can I write a patch to do this
and do I integrate it to my PKGBUILD

thank you very much in advance

contrasutra · 2004-05-02 01:52:12

Modify the line, and then save the Makefile and something like Makefile.new. Then run this to make a patch:

diff -u Makefile Makefile.new > Makefile.patch

Then in your PKGBUILD, run the patch like this:

patch -p0 < $startdir/Makefile.patch

Modify the instructions to taste.

kpiche · 2004-05-02 01:59:24

Well you have two possibilities: use sed or use diff to create a patch. With sed:

sed -i -e '/^CFLAGS +=/  s@data@/usr/local/share/de-jong-explorer/data@' Makefile

Or keep a copy of the original Makefile, create the new one and then diff:

diff -Naur Makefile.orig Makefile >patchfile

Then in the PKGBUILD apply with patch:

patch -Np0 -i patchfile

You may have to change the 0 to suit pathnames in the source tree. See the man page.

zeppelin · 2004-05-02 23:39:27

Arch Linux