diff options
author | Eivind Næss <eivnaes@yahoo.com> | 2021-04-23 22:26:06 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-24 15:26:06 +1000 |
commit | 750475927f15964be39a8bdda8ea2f57c764f846 (patch) | |
tree | 8f75ea4153d16d3d5243fd2bc6d155df32738861 /pppstats | |
parent | 6cc7077fffa65c81a7b13c200e666c35419b8265 (diff) | |
download | ppp-750475927f15964be39a8bdda8ea2f57c764f846.tar.gz |
Add pkgconfig support to PPP project (#270)
This adds pppd.pc into $(INSTROOT)/$(LIBDIR)/pkgconfig. On some distributions
this would be /lib/pkgconfig, or /usr/lib/pkgconfig, but other distributions
may consider specifying --libdir=/usr/lib/x86_x64-linux-gnu/ and the pkgconfig
directory would be under that. Allowing --libdir to be specified at configure
time fixes #223, providing pkgconfig support fixes #19 and allows third party
packages pickup the plugin directory.
Manually cherry picking parts of two commits by @lkundrak from:
https://github.com/NetworkManager/ppp/tree/lr/pkgconfig
Mainly, the difference between the original commit is not to replace DESTDIR
with "prefix". Leave DESTDIR alone, and add needed pkgconfig (pppd.pc.in)
as a part of the linux distribution (previously in pppd/plugin directory).
This fixes GitHub issues: #19 #47 and #223
Signed-off-by: Eivind Naess <eivnaes@yahoo.com>
Diffstat (limited to 'pppstats')
-rw-r--r-- | pppstats/Makefile.linux | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux index ddfe0cc..743ffaf 100644 --- a/pppstats/Makefile.linux +++ b/pppstats/Makefile.linux @@ -5,7 +5,8 @@ CROSS_COMPILE=@CROSS_COMPILE@ CC=$(CROSS_COMPILE)@CC@ COPTS=@CFLAGS@ -DESTDIR = $(INSTROOT)@DESTDIR@ +PREFIX = @DESTDIR@ +DESTDIR = $(INSTROOT)$(PREFIX) BINDIR = $(DESTDIR)/sbin MANDIR = $(DESTDIR)/share/man/man8 |