From e12d452b176af4e2b7cd0087408ab2434037edd2 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Mon, 24 Jul 2006 18:51:38 +0000
Subject: [PATCH] [tw] two more libdir fixes

---
 ppp-2.4.4-lib64.patch | 74 ++++++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/ppp-2.4.4-lib64.patch b/ppp-2.4.4-lib64.patch
index 4cebc5d..be154f1 100644
--- a/ppp-2.4.4-lib64.patch
+++ b/ppp-2.4.4-lib64.patch
@@ -1,5 +1,51 @@
---- ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-19 14:16:01.000000000 +0200
-+++ ppp-2.4.4/pppd/Makefile.linux	2006-07-19 14:25:03.000000000 +0200
+--- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux	2006-07-24 20:44:56.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
+ 
+ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
+--- ppp-2.4.4/pppd/plugins/radius/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux	2006-07-24 20:44:45.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ MANDIR = $(DESTDIR)/share/man/man8
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
+ 
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
+--- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.lib64	2004-11-14 02:12:10.000000000 +0100
++++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux	2006-07-24 20:44:29.000000000 +0200
+@@ -6,8 +6,8 @@
+ 
+ #***********************************************************************
+ 
+-DESTDIR = @DESTDIR@
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++DESTDIR = $(INSTROOT)@DESTDIR@
++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
+ 
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
+--- ppp-2.4.4/pppd/plugins/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/plugins/Makefile.linux	2006-07-24 20:43:40.000000000 +0200
+@@ -7,7 +7,7 @@
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+ MANDIR = $(DESTDIR)/share/man/man8
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
+ 
+ SUBDIRS := rp-pppoe pppoatm
+ # Uncomment the next line to include the radius authentication plugin
+--- ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/Makefile.linux	2006-07-24 20:43:40.000000000 +0200
 @@ -8,6 +8,7 @@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
@@ -17,19 +63,8 @@
  LIBS = -lutil
  
  # Uncomment the next 2 lines to include support for Microsoft's
---- ppp-2.4.4/pppd/plugins/Makefile.linux.lib64	2006-07-19 14:16:01.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/Makefile.linux	2006-07-19 14:21:08.000000000 +0200
-@@ -7,7 +7,7 @@
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
- 
- SUBDIRS := rp-pppoe pppoatm
- # Uncomment the next line to include the radius authentication plugin
 --- ppp-2.4.4/pppd/pathnames.h.lib64	2005-08-26 01:59:34.000000000 +0200
-+++ ppp-2.4.4/pppd/pathnames.h	2006-07-19 14:26:24.000000000 +0200
++++ ppp-2.4.4/pppd/pathnames.h	2006-07-24 20:43:40.000000000 +0200
 @@ -57,7 +57,7 @@
  
  #ifdef PLUGIN
@@ -39,14 +74,3 @@
  #else /* __STDC__ */
  #define _PATH_PLUGIN	"/usr/lib/pppd"
  #endif /* __STDC__ */
---- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.lib64	2006-07-19 15:29:53.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux	2006-07-19 15:30:23.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- #***********************************************************************
- 
--DESTDIR = @DESTDIR@
-+DESTDIR = $(INSTROOT)@DESTDIR@
- LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)