Patchwork pppd: fix plugin search path

login
register
mail settings
Submitter Gustavo Zacarias
Date June 11, 2012, 5:20 p.m.
Message ID <1339435239-9581-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/164231/
State Accepted
Commit b9910f1906dc8dab6ba65fcb464ee4095c6c944a
Headers show

Comments

Gustavo Zacarias - June 11, 2012, 5:20 p.m.
Fix the plugin search path by passing a --prefix to configure.
DESTDIR is used in the source code for the search path of plugins
(DESTDIR/lib/pppd/VERSION).
Since DESTDIR defaults to /usr/local we get the search path wrong so the
'plugin' directive requires a full pathspec to the plugin rather than
the .so name, which isn't nice or portable.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/pppd/pppd.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Peter Korsgaard - June 11, 2012, 7:32 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Fix the plugin search path by passing a --prefix to configure.
 Gustavo> DESTDIR is used in the source code for the search path of plugins
 Gustavo> (DESTDIR/lib/pppd/VERSION).
 Gustavo> Since DESTDIR defaults to /usr/local we get the search path wrong so the
 Gustavo> 'plugin' directive requires a full pathspec to the plugin rather than
 Gustavo> the .so name, which isn't nice or portable.

Committed, thanks.

Patch

diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 2137f6a..a62f495 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -26,7 +26,7 @@  endif
 define PPPD_CONFIGURE_CMDS
 	$(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
 	$(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
-	( cd $(@D); ./configure )
+	( cd $(@D); ./configure --prefix=/usr )
 endef
 
 define PPPD_BUILD_CMDS