Add $(INSTDIR) to installation paths in Linux makefiles.

Patch from Robert Vogelgesang.

This patch re-introduces the possibility for package maintainers to
install into a different filesystem tree. This is done by adding
$(INSTROOT) at various places; the package maintainers can then
issue a

        make install INSTROOT=/some/where/else

when they package pppd for their distribution.  In previous versions
of the ppp package this was possible using the variable DESTDIR, but
this variable is now used for a different purpose and cannot be
changed via additional parameters of the make command.

diff --git a/chat/Makefile.linux b/chat/Makefile.linux
index 1519f296df7e1ff0dcb74eb3d0fd469ed8b5c9a8..1065ac51957632606a777711f222887a5f6a98d8 100644 (file)
--- a/chat/Makefile.linux
+++ b/chat/Makefile.linux
@@ -1,6 +1,6 @@
-#      $Id: Makefile.linux,v 1.14 2006/05/22 00:16:57 paulus Exp $
+#      $Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $
 
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 

diff --git a/linux/Makefile.top b/linux/Makefile.top
index 55405f1687ff662a932bde2fb6c03b57e7d22840..f63d45e58a78ab2e275c8dbffbac8469126ed8a4 100644 (file)
--- a/linux/Makefile.top
+++ b/linux/Makefile.top
@@ -1,10 +1,10 @@
 # PPP top-level Makefile for Linux.
 
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 INCDIR = $(DESTDIR)/include
 MANDIR = $(DESTDIR)/share/man
-ETCDIR = @SYSCONF@/ppp
+ETCDIR = $(INSTROOT)@SYSCONF@/ppp
 
 # uid 0 = root
 INSTALL= install

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 306f8f3979b5b145e969880bb19f97a884c49421..af8f6c615dc37c280adfbb48a9bb1d5dba30e52c 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,10 +1,10 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.68 2005/07/12 01:50:23 paulus Exp $
+# $Id: Makefile.linux,v 1.69 2006/06/04 05:07:46 paulus Exp $
 #
 
 # Default installation locations
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 INCDIR = $(DESTDIR)/include

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index a1f5c320ca9c90fceaad78cafa6acc51b4db2263..39f523a9203d9712818325dc6bfb9a3b4b97ff1d 100644 (file)
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -4,7 +4,7 @@ CFLAGS  = $(COPTS) -I.. -I../../include -fPIC
 LDFLAGS        = -shared
 INSTALL        = install
 
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)

diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
index 2b071aabefd33e8534f7d4bbfee31d9f414bd056..24ed3e580c4db6aeca129dd22dbe6de5f2d1ff5f 100644 (file)
--- a/pppd/plugins/radius/Makefile.linux
+++ b/pppd/plugins/radius/Makefile.linux
@@ -3,7 +3,7 @@
 # Copyright 2002 Roaring Penguin Software Inc.
 #
 
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 MANDIR = $(DESTDIR)/share/man/man8
 LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 

diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
index 2ffa1c079b3f0c1cb6ce424e61c4bb62da2ac356..b874a23526fbfad8179fa88c39ab7896745ec568 100644 (file)
--- a/pppd/plugins/rp-pppoe/Makefile.linux
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
@@ -10,10 +10,10 @@
 # This program may be distributed according to the terms of the GNU
 # General Public License, version 2 or (at your option) any later version.
 #
-# $Id: Makefile.linux,v 1.6 2004/11/14 07:58:37 paulus Exp $
+# $Id: Makefile.linux,v 1.7 2006/06/04 05:07:46 paulus Exp $
 #***********************************************************************
 
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
 

diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
index 197e897931cf84083b206703a9093c42e409bcea..ac028f6bf4f0d121f38ff1519ee2632c1a663df8 100644 (file)
--- a/pppdump/Makefile.linux
+++ b/pppdump/Makefile.linux
@@ -1,4 +1,4 @@
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 

diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
index 6b8fb478d0682782286f8dff7585fe0f34fa32d0..cca6f0f61d87f70016e903dbad7821dc87473249 100644 (file)
--- a/pppstats/Makefile.linux
+++ b/pppstats/Makefile.linux
@@ -1,8 +1,8 @@
 #
 # pppstats makefile
-# $Id: Makefile.linux,v 1.8 2004/10/31 22:09:03 paulus Exp $
+# $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $
 #
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8