diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-06 17:03:54 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-06 17:03:54 +0000 |
| commit | 1e249a9804103b641bbc379c02745895052a6e35 (patch) | |
| tree | 3b7ac43d78ae3957df6647e9172848e55cefcdfa | |
| parent | 8e19bc8c6d2ea133725bbe2c9399a0c5f68775be (diff) | |
Remove unused variable 'bindir' from fltk-config and fix CMake local usage.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10555 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fltk-config.cmake.in | 6 | ||||
| -rwxr-xr-x | fltk-config.in | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/fltk-config.cmake.in b/fltk-config.cmake.in index ff65040b4..93e666ab4 100644 --- a/fltk-config.cmake.in +++ b/fltk-config.cmake.in @@ -4,7 +4,7 @@ # # FLTK configuration utility. # -# Copyright 2000-2010 by Bill Spitzak and others. +# Copyright 2000-2015 by Bill Spitzak and others. # Original version Copyright 2000 by James Dean Palmer # Adapted by Vincent Penne and Michael Sweet # @@ -31,7 +31,6 @@ selfdir=`dirname "$0"` prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} exec_prefix_set=no -bindir=@PREFIX_BIN@ includedir=@PREFIX_INCLUDE@ libdir=@PREFIX_LIB@ srcdir=. @@ -50,8 +49,7 @@ OPTIM="@OPTION_OPTIM@" CAIROFLAGS="@CAIROFLAGS@" # Check for local invocation, and update paths accordingly... -if test -f "$selfdir/bin/UseFLTK.cmake"; then - bindir="$selfdir/bin/fluid" +if test -f "$selfdir/bin/fluid"; then includedir="@FLTK_SOURCE_DIR@" libdir="$selfdir/lib" diff --git a/fltk-config.in b/fltk-config.in index 0da30ad09..a6bee38ad 100755 --- a/fltk-config.in +++ b/fltk-config.in @@ -4,7 +4,7 @@ # # FLTK configuration utility. # -# Copyright 2000-2010 by Bill Spitzak and others. +# Copyright 2000-2015 by Bill Spitzak and others. # Original version Copyright 2000 by James Dean Palmer # Adapted by Vincent Penne and Michael Sweet # @@ -31,7 +31,6 @@ selfdir=`dirname "$0"` prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set=no -bindir=@bindir@ includedir=@includedir@ libdir=@libdir@ srcdir=@srcdir@ @@ -51,7 +50,6 @@ CAIROFLAGS="@CAIROFLAGS@" # Check for local invocation, and update paths accordingly... if test -f "$selfdir/FL/Fl_Window.H"; then - bindir="$selfdir/fluid" includedir="$selfdir" libdir="$selfdir/lib" |