diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /package/fltk/patches/patch-Makefile | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'package/fltk/patches/patch-Makefile')
| -rw-r--r-- | package/fltk/patches/patch-Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile index 466aef887..568110189 100644 --- a/package/fltk/patches/patch-Makefile +++ b/package/fltk/patches/patch-Makefile @@ -1,11 +1,11 @@ ---- fltk-2.0.x-r7513.orig/Makefile 2010-04-15 18:29:49.000000000 +0200 -+++ fltk-2.0.x-r7513/Makefile 2011-01-14 22:01:49.000000000 +0100 -@@ -25,7 +25,7 @@ +--- fltk-1.3.0.orig/Makefile 2011-02-15 16:29:03.000000000 +0100 ++++ fltk-1.3.0/Makefile 2011-09-12 20:20:27.137980830 +0200 +@@ -27,7 +27,7 @@ include makeinclude --DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test -+DIRS = src $(LOCALIMAGES) images OpenGL fluid +-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation ++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation - all: makeinclude + all: makeinclude fltk-config for dir in $(DIRS); do\ |