diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
commit | 29486d09fc74ca557f97136ac852767e48a981f2 (patch) | |
tree | 7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /package/gawk/patches/patch-Makefile_in | |
parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) |
resolve merge conflict
Diffstat (limited to 'package/gawk/patches/patch-Makefile_in')
-rw-r--r-- | package/gawk/patches/patch-Makefile_in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/package/gawk/patches/patch-Makefile_in b/package/gawk/patches/patch-Makefile_in new file mode 100644 index 000000000..6581d289a --- /dev/null +++ b/package/gawk/patches/patch-Makefile_in @@ -0,0 +1,12 @@ +--- gawk-3.1.7.orig/Makefile.in 2009-07-21 21:29:59.000000000 +0200 ++++ gawk-3.1.7/Makefile.in 2010-02-23 21:42:10.887094938 +0100 +@@ -364,8 +364,7 @@ SUBDIRS = \ + . \ + awklib \ + doc \ +- po \ +- test ++ po + + + # sources for both gawk and pgawk |