From: Paul Mackerras <paulus@samba.org>
Date: Sun, 10 Jul 2005 11:19:10 +0000 (+0000)
Subject: Get the plugins from the right directory when DESTDIR isn't /usr.
X-Git-Tag: ppp-2.4.7~147
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=0296079a6611dd4150cf7dc946828f3d3f9def7a

Get the plugins from the right directory when DESTDIR isn't /usr.
---

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index e7e52b8..d75b20c 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.66 2004/11/13 12:02:22 paulus Exp $
+# $Id: Makefile.linux,v 1.67 2005/07/10 11:19:10 paulus Exp $
 #
 
 # Default installation locations
@@ -79,7 +79,7 @@ INCLUDE_DIRS= -I../include
 
 COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
 
-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
 
 ifdef CHAPMS
 CFLAGS   += -DCHAPMS=1
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index 555f40f..f070b43 100644
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -1,7 +1,7 @@
 /*
  * define path names
  *
- * $Id: pathnames.h,v 1.16 2004/11/13 12:02:22 paulus Exp $
+ * $Id: pathnames.h,v 1.17 2005/07/10 11:19:10 paulus Exp $
  */
 
 #ifdef HAVE_PATHS_H
@@ -55,5 +55,10 @@
 #endif /* __STDC__ */
 
 #ifdef PLUGIN
-#define _PATH_PLUGIN	"/usr/lib/pppd/" VERSION
+#ifdef __STDC__
+#define _PATH_PLUGIN	DESTDIR "/lib/pppd/" VERSION
+#else /* __STDC__ */
+#define _PATH_PLUGIN	"/usr/lib/pppd"
+#endif /* __STDC__ */
+
 #endif /* PLUGIN */