]> git.pld-linux.org Git - packages/capi4k-utils.git/blobdiff - capi4k-utils-amd64.patch
projects / packages / capi4k-utils.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- fix build with ppp 2.4.7
[packages/capi4k-utils.git] / capi4k-utils-amd64.patch
diff --git a/capi4k-utils-amd64.patch b/capi4k-utils-amd64.patch
index 8f956fca87ca27712ca9d7b49ae97337c9434563..370aceb9cf2a8fc06e8677c761966b4cf2c5f856 100644 (file)
--- a/capi4k-utils-amd64.patch
+++ b/capi4k-utils-amd64.patch
@@ -34,12 +34,13 @@ diff -Naur capi4k-utils.orig/Makefile capi4k-utils/Makefile
 diff -Naur capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile
 --- capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile        2004-12-21 17:45:25.000000000 +0100
 +++ capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile     2004-12-22 20:44:47.104531152 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
@@ -58,120 +59,130 @@ diff -Naur capi4k-utils.orig/pppdcapiplugin/Rules.make capi4k-utils/pppdcapiplug
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/Makefile.template ./pppdcapiplugin/Makefile.template
 --- ../capi4k-utils.orig/pppdcapiplugin/Makefile.template      2001-05-01 14:43:49.000000000 +0200
 +++ ./pppdcapiplugin/Makefile.template 2011-02-19 22:45:36.613077158 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile ./pppdcapiplugin/ppp-2.3.11/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.3.11/Makefile    2001-05-01 14:43:49.000000000 +0200
 +++ ./pppdcapiplugin/ppp-2.3.11/Makefile       2011-02-19 22:45:36.609744073 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile ./pppdcapiplugin/ppp-2.4.0/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.0/Makefile     2001-05-01 14:43:50.000000000 +0200
 +++ ./pppdcapiplugin/ppp-2.4.0/Makefile        2011-02-19 22:45:36.616410243 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile ./pppdcapiplugin/ppp-2.4.1/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1/Makefile     2001-05-01 14:43:50.000000000 +0200
 +++ ./pppdcapiplugin/ppp-2.4.1/Makefile        2011-02-19 22:45:36.619743328 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile ./pppdcapiplugin/ppp-2.4.1b1/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b1/Makefile   2001-05-01 14:43:51.000000000 +0200
 +++ ./pppdcapiplugin/ppp-2.4.1b1/Makefile      2011-02-19 22:45:36.623076413 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile ./pppdcapiplugin/ppp-2.4.1b2/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.1b2/Makefile   2001-05-01 14:43:52.000000000 +0200
 +++ ./pppdcapiplugin/ppp-2.4.1b2/Makefile      2011-02-19 22:45:36.626409498 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile ./pppdcapiplugin/ppp-2.4.2b3/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2b3/Makefile   2003-05-18 22:11:15.000000000 +0200
 +++ ./pppdcapiplugin/ppp-2.4.2b3/Makefile      2011-02-19 22:45:36.586412480 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile ./pppdcapiplugin/ppp-2.4.3/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.3/Makefile     2004-12-13 23:05:14.000000000 +0100
 +++ ./pppdcapiplugin/ppp-2.4.3/Makefile        2011-02-19 22:45:36.626409498 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile ./pppdcapiplugin/ppp-2.4.4/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.4/Makefile     2011-02-19 22:45:02.235639872 +0100
 +++ ./pppdcapiplugin/ppp-2.4.4/Makefile        2011-02-19 22:45:36.629742583 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
 diff -r -u ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile ./pppdcapiplugin/ppp-2.4.5/Makefile
 --- ../capi4k-utils.orig/pppdcapiplugin/ppp-2.4.5/Makefile     2011-02-19 22:45:02.242306040 +0100
 +++ ./pppdcapiplugin/ppp-2.4.5/Makefile        2011-02-19 22:45:36.633075668 +0100
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
++include ../../.config
 -PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
  include $(TOPDIR)/Rules.make
  
CAPI 2.0 libraries and configuration tools
This page took 0.084207 seconds and 4 git commands to generate.