* [PATCH lksctp-tools] withsctp: use @PACKAGE_VERSION@ in withsctp.h
@ 2018-08-16 6:12 Xin Long
2018-08-16 11:08 ` Neil Horman
2018-08-16 18:18 ` Marcelo Ricardo Leitner
0 siblings, 2 replies; 3+ messages in thread
From: Xin Long @ 2018-08-16 6:12 UTC (permalink / raw)
To: linux-sctp
use @PACKAGE_VERSION@ to replace the hardcode version.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
Makefile.rules | 3 ++-
src/withsctp/withsctp.in | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.rules b/Makefile.rules
index 83f5f0c..d3693fa 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -15,4 +15,5 @@
edit = @sed \
-e "s|\@bindir\@|$(bindir)|" \
-e "s|\@libdir\@|$(libdir)|" \
- -e "s|\@PACKAGE\@|$(PACKAGE)|"
+ -e "s|\@PACKAGE\@|$(PACKAGE)|" \
+ -e "s|\@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|"
diff --git a/src/withsctp/withsctp.in b/src/withsctp/withsctp.in
index 7f182ba..fda5ebc 100644
--- a/src/withsctp/withsctp.in
+++ b/src/withsctp/withsctp.in
@@ -2,7 +2,8 @@
# -*- sh -*-
LIBDIR=@libdir@/@PACKAGE@
BINDIR=@bindir@
-export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.17
+LIBVER=@PACKAGE_VERSION@
+export LD_PRELOAD=${LIBDIR}/libwithsctp.so.${LIBVER}
if ! ${BINDIR}/checksctp 2> /dev/null
then
${BINDIR}/checksctp;
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH lksctp-tools] withsctp: use @PACKAGE_VERSION@ in withsctp.h
2018-08-16 6:12 [PATCH lksctp-tools] withsctp: use @PACKAGE_VERSION@ in withsctp.h Xin Long
@ 2018-08-16 11:08 ` Neil Horman
2018-08-16 18:18 ` Marcelo Ricardo Leitner
1 sibling, 0 replies; 3+ messages in thread
From: Neil Horman @ 2018-08-16 11:08 UTC (permalink / raw)
To: linux-sctp
On Thu, Aug 16, 2018 at 02:12:01PM +0800, Xin Long wrote:
> use @PACKAGE_VERSION@ to replace the hardcode version.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
> ---
> Makefile.rules | 3 ++-
> src/withsctp/withsctp.in | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile.rules b/Makefile.rules
> index 83f5f0c..d3693fa 100644
> --- a/Makefile.rules
> +++ b/Makefile.rules
> @@ -15,4 +15,5 @@
> edit = @sed \
> -e "s|\@bindir\@|$(bindir)|" \
> -e "s|\@libdir\@|$(libdir)|" \
> - -e "s|\@PACKAGE\@|$(PACKAGE)|"
> + -e "s|\@PACKAGE\@|$(PACKAGE)|" \
> + -e "s|\@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|"
> diff --git a/src/withsctp/withsctp.in b/src/withsctp/withsctp.in
> index 7f182ba..fda5ebc 100644
> --- a/src/withsctp/withsctp.in
> +++ b/src/withsctp/withsctp.in
> @@ -2,7 +2,8 @@
> # -*- sh -*-
> LIBDIR=@libdir@/@PACKAGE@
> BINDIR=@bindir@
> -export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.17
> +LIBVER=@PACKAGE_VERSION@
> +export LD_PRELOAD=${LIBDIR}/libwithsctp.so.${LIBVER}
> if ! ${BINDIR}/checksctp 2> /dev/null
> then
> ${BINDIR}/checksctp;
> --
> 2.1.0
>
>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH lksctp-tools] withsctp: use @PACKAGE_VERSION@ in withsctp.h
2018-08-16 6:12 [PATCH lksctp-tools] withsctp: use @PACKAGE_VERSION@ in withsctp.h Xin Long
2018-08-16 11:08 ` Neil Horman
@ 2018-08-16 18:18 ` Marcelo Ricardo Leitner
1 sibling, 0 replies; 3+ messages in thread
From: Marcelo Ricardo Leitner @ 2018-08-16 18:18 UTC (permalink / raw)
To: linux-sctp
On Thu, Aug 16, 2018 at 02:12:01PM +0800, Xin Long wrote:
> use @PACKAGE_VERSION@ to replace the hardcode version.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-16 18:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-16 6:12 [PATCH lksctp-tools] withsctp: use @PACKAGE_VERSION@ in withsctp.h Xin Long
2018-08-16 11:08 ` Neil Horman
2018-08-16 18:18 ` Marcelo Ricardo Leitner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).