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-fltk2-config_in | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'package/fltk/patches/patch-fltk2-config_in')
| -rw-r--r-- | package/fltk/patches/patch-fltk2-config_in | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in deleted file mode 100644 index c4784688a..000000000 --- a/package/fltk/patches/patch-fltk2-config_in +++ /dev/null @@ -1,27 +0,0 @@ ---- fltk-2.0.x-r7513.orig/fltk2-config.in 2006-04-15 19:43:12.000000000 +0200 -+++ fltk-2.0.x-r7513/fltk2-config.in 2011-01-08 23:34:40.000000000 +0100 -@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@" - # libraries to link with: - LIBNAME="@LIBNAME@" - DSONAME="@DSONAME@" --DSOLINK="@DSOLINK@" - IMAGELIBS="@IMAGELIBS@" - SHAREDSUFFIX="@SHAREDSUFFIX@" - -@@ -168,7 +167,6 @@ do - bindir=${exec_prefix} - includedir=${prefix}/include - libdir=${prefix}/lib -- DSOLINK="-Wl,-rpath,${prefix}/lib" - ;; - --prefix) - echo_prefix=yes -@@ -283,7 +281,7 @@ if test x$use_images = xyes; then - LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS" - fi - --LDLIBS="$DSOLINK $LDLIBS" -+LDLIBS="$LDLIBS" - LDSTATIC="$LDSTATIC_PATHS $LDSTATIC" - - # Answer to user requests |