mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused variable 'bindir' from fltk-config and fix CMake local usage.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10555 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2015-02-06 17:03:54 +00:00
parent 8e19bc8c6d
commit 1e249a9804
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fltk-config.cmake.in
View File

@ -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"

4
fltk-config.in
View File

@ -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"