0c47ac0794
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/ppp.git#23f594e00896a75b4cf3690aa4a32e0d11917cf7
100 lines
3.5 KiB
Diff
100 lines
3.5 KiB
Diff
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
index 6a4b897..8f29c1f 100644
|
|
--- a/pppd/Makefile.linux
|
|
+++ b/pppd/Makefile.linux
|
|
@@ -12,6 +12,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
|
|
BINDIR = $(DESTDIR)/sbin
|
|
MANDIR = $(DESTDIR)/share/man/man8
|
|
INCDIR = $(DESTDIR)/include
|
|
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
|
|
|
|
TARGETS = pppd
|
|
|
|
@@ -93,7 +94,7 @@ INCLUDE_DIRS= -I../include
|
|
|
|
COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -pipe
|
|
|
|
-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
|
|
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' -DLIBDIR=\""$(LIBDIR)"\"
|
|
|
|
ifdef CHAPMS
|
|
CFLAGS += -DCHAPMS=1
|
|
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
|
|
index 524d608..c7eadbb 100644
|
|
--- a/pppd/pathnames.h
|
|
+++ b/pppd/pathnames.h
|
|
@@ -62,7 +62,7 @@
|
|
|
|
#ifdef PLUGIN
|
|
#ifdef __STDC__
|
|
-#define _PATH_PLUGIN DESTDIR "/lib/pppd/" VERSION
|
|
+#define _PATH_PLUGIN LIBDIR "/pppd/" VERSION
|
|
#else /* __STDC__ */
|
|
#define _PATH_PLUGIN "/usr/lib/pppd"
|
|
#endif /* __STDC__ */
|
|
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
|
|
index 6403e3d..f42d18c 100644
|
|
--- a/pppd/plugins/Makefile.linux
|
|
+++ b/pppd/plugins/Makefile.linux
|
|
@@ -5,7 +5,7 @@ COPTS=@CFLAGS@
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
BINDIR = $(DESTDIR)/sbin
|
|
MANDIR = $(DESTDIR)/share/man/man8
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
|
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
LDFLAGS_SHARED = -shared
|
|
diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
|
|
index d3a8086..c2aff0c 100644
|
|
--- a/pppd/plugins/pppoatm/Makefile.linux
|
|
+++ b/pppd/plugins/pppoatm/Makefile.linux
|
|
@@ -4,7 +4,7 @@ CC=$(CROSS_COMPILE)@CC@
|
|
COPTS=@CFLAGS@
|
|
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
-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)
|
|
|
|
diff --git a/pppd/plugins/pppoe/Makefile.linux b/pppd/plugins/pppoe/Makefile.linux
|
|
index c415ce3..d3b7392 100644
|
|
--- a/pppd/plugins/pppoe/Makefile.linux
|
|
+++ b/pppd/plugins/pppoe/Makefile.linux
|
|
@@ -18,7 +18,7 @@ COPTS=@CFLAGS@
|
|
|
|
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)
|
|
|
|
diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
|
|
index 1aa1c0b..e4442f9 100644
|
|
--- a/pppd/plugins/pppol2tp/Makefile.linux
|
|
+++ b/pppd/plugins/pppol2tp/Makefile.linux
|
|
@@ -4,7 +4,7 @@ CC=$(CROSS_COMPILE)@CC@
|
|
COPTS=@CFLAGS@
|
|
|
|
DESTDIR = $(INSTROOT)/@DESTDIR@
|
|
-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)
|
|
|
|
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
|
|
index 489aef2..d2ef044 100644
|
|
--- a/pppd/plugins/radius/Makefile.linux
|
|
+++ b/pppd/plugins/radius/Makefile.linux
|
|
@@ -9,7 +9,7 @@ COPTS=@CFLAGS@
|
|
|
|
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)
|
|
|