diff options
author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-06-28 02:21:58 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-06-28 02:37:42 +0700 |
commit | 4b73edd813103f71a271f982914973ffe3f45cab (patch) | |
tree | 886acf8762a3dd350208914f404790b737b8c512 | |
parent | e982744b2fe59949343541a1c0bb2706c514e6e6 (diff) | |
download | slackbuilds-4b73edd813103f71a271f982914973ffe3f45cab.tar.gz |
libraries/fltk13: Use standard paths.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r-- | libraries/fltk13/README | 5 | ||||
-rw-r--r-- | libraries/fltk13/fltk13.SlackBuild | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/libraries/fltk13/README b/libraries/fltk13/README index bf03c31e34..a1a2910cee 100644 --- a/libraries/fltk13/README +++ b/libraries/fltk13/README @@ -5,14 +5,9 @@ supports 3D graphics via OpenGL(r) and its built-in GLUT emulation. It was originally developed by Mr. Bill Spitzak and is currently maintained by a small group of developers across the world with a central repository in the US. -This is 1.3.x (in development) series. - CAVEATS: 1) fltk13 can be installed alongside fltk (1.1.x), but in order to build it, you may need to remove fltk first (with removepkg); you can then reinstall it afterwards. YMMV. -2) In order to avoid conflicting files and some other problems, the homonyms -are renamed, and library and include directories are moved to nonstandard -locations (<libdir>/fltk13/ and /usr/include/fltk13/FL). If you want cairo support, you need to pass CAIRO=1 to the build script. diff --git a/libraries/fltk13/fltk13.SlackBuild b/libraries/fltk13/fltk13.SlackBuild index 02894c7153..e7c266b918 100644 --- a/libraries/fltk13/fltk13.SlackBuild +++ b/libraries/fltk13/fltk13.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=fltk13 VERSION=${VERSION:-1.3.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -85,15 +85,18 @@ case "$CAIRO" in *) CAIRO_FLAG="en" ;; esac +# Add small patch for eureka +sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' FL/x.H + # --docdir seems to be ignored here CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX}/fltk13 \ - --includedir=/usr/include/fltk13 \ - --datadir=/usr/share/fltk13 \ + --libdir=/usr/lib${LIBDIRSUFFIX}/ \ + --includedir=/usr/include/ \ + --datadir=/usr/share/ \ --localstatedir=/var \ --mandir=/usr/man \ --enable-gl \ |