summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING2
-rw-r--r--INSTALL11
-rw-r--r--NEWS6
-rwxr-xr-xconfigure18
-rw-r--r--doc/index.html4
-rw-r--r--doc/upgrade.html8
-rw-r--r--package/info2
7 files changed, 25 insertions, 26 deletions
diff --git a/COPYING b/COPYING
index 90f2243..ad8b230 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2023 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2016-2024 Laurent Bercot <ska-skaware@skarnet.org>
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index 89c9353..8548dd5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
- A Linux-based system with a standard C development environment
- GNU make version 3.81 or later
- - skalibs version 2.14.0.0 or later: https://skarnet.org/software/skalibs/
+ - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/
This software is Linux-specific. It will run on a Linux kernel,
version 2.6.32 or later. However, it is not hard to port to
@@ -19,14 +19,7 @@ other Unix-like operating systems.
./configure && make && sudo make install
will work for most users.
- It will install the binaries in /usr/bin and the libraries in /usr/lib/bcnm.
-
- Please note that static libraries in /usr/lib/bcnm *will not*
-be found by a default linker invocation: you need -L/usr/lib/bcnm.
-Other skarnet.org software automatically handles that case if the
-default configuration is used, but if you change the configuration,
-remember to use the appropriate --with-lib configure option.
-
+ It will install the binaries in /usr/bin and the libraries in /usr/lib.
You can strip the binaries and libraries of their extra symbols via
"make strip" before the "make install" phase. It will shave a few bytes
diff --git a/NEWS b/NEWS
index ae22a73..c7e7d82 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Changelog for bcnm
+In 0.0.1.8
+----------
+
+ - Install static libraries in /usr/lib by default.
+
+
In 0.0.1.7
----------
diff --git a/configure b/configure
index f9f4146..6cda6b5 100755
--- a/configure
+++ b/configure
@@ -21,11 +21,11 @@ Fine tuning of the installation directories:
--dynlibdir=DIR shared library files [PREFIX/lib]
--bindir=BINDIR user executables [EPREFIX/bin]
--libexecdir=DIR package-scoped executables [EPREFIX/libexec]
- --libdir=DIR static library files [PREFIX/lib/$package]
+ --libdir=DIR static library files [PREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
If no --prefix option is given, by default libdir (but not dynlibdir) will be
- /usr/lib/$package, and includedir will be /usr/include.
+ /usr/lib, and includedir will be /usr/include.
Dependencies:
--with-sysdeps=DIR use sysdeps in DIR [PREFIX/lib/skalibs/sysdeps]
@@ -139,7 +139,7 @@ exec_prefix='$prefix'
dynlibdir='$prefix/lib'
libexecdir='$exec_prefix/libexec'
bindir='$exec_prefix/bin'
-libdir='$prefix/lib/$package'
+libdir='$prefix/lib'
includedir='$prefix/include'
sysdeps='$prefix/lib/skalibs/sysdeps'
manualsysdeps=false
@@ -202,8 +202,8 @@ done
# Add /usr in the default default case
if test -z "$prefix" ; then
- if test "$libdir" = '$prefix/lib/$package' ; then
- libdir=/usr/lib/$package
+ if test "$libdir" = '$prefix/lib' ; then
+ libdir=/usr/lib
fi
if test "$includedir" = '$prefix/include' ; then
includedir=/usr/include
@@ -360,14 +360,6 @@ fi
LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}"
-if test -z "$vpaths" ; then
- while read dep ; do
- base=$(basename $dep) ;
- vpaths="$vpaths /usr/lib/$base"
- addlibspath="$addlibspath -L/usr/lib/$base"
- done < package/deps-build
-fi
-
if $allstatic ; then
LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}"
tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections
diff --git a/doc/index.html b/doc/index.html
index 65f4206..4c8034b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -46,7 +46,7 @@ certain state, and a comfortable C API to control
<li> A Linux-based system with a standard C development environment </li>
<li> GNU make, version 3.81 or later </li>
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.14.0.0 or later. It's a build-time requirement. It's also a run-time
+2.14.3.0 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs library. </li>
</ul>
@@ -61,7 +61,7 @@ requirement if you link against the shared version of the skalibs library. </li>
<ul>
<li> The current released version of bcnm is
-<a href="bcnm-0.0.1.7.tar.gz">0.0.1.7</a>. </li>
+<a href="bcnm-0.0.1.8.tar.gz">0.0.1.8</a>. </li>
<li> Alternatively, you can checkout a copy of the
<a href="//git.skarnet.org/cgi-bin/cgit.cgi/bcnm/">bcnm
git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 57ca158..88576f4 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,14 @@
<h1> What has changed in bcnm </h1>
+<h2> in 0.0.1.8 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.3.0. </li>
+ <li> Static libraries are installed in <tt>/usr/lib</tt> by default. </li>
+</ul>
+
<h2> in 0.0.1.7 </h2>
<ul>
diff --git a/package/info b/package/info
index c2234b1..8b8ba06 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=bcnm
-version=0.0.1.7
+version=0.0.1.8
category=admin
package_macro_name=BCNM