makefile.patch 3.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115
  1. From f7fb1d1abfa6d208fb40fca1602e0c488108f1b5 Mon Sep 17 00:00:00 2001
  2. From: Richard Purdie <richard@openedhand.com>
  3. Date: Wed, 31 Aug 2005 10:45:47 +0000
  4. Subject: [PATCH] Initial population
  5. The patch comes from OpenEmbedded
  6. Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
  7. Upstream-Status: Inappropriate [configuration]
  8. ---
  9. chat/Makefile.linux | 2 +-
  10. pppd/Makefile.linux | 4 ++--
  11. pppd/plugins/radius/Makefile.linux | 10 +++++-----
  12. pppd/plugins/rp-pppoe/Makefile.linux | 4 ++--
  13. pppdump/Makefile.linux | 2 +-
  14. pppstats/Makefile.linux | 2 +-
  15. 6 files changed, 12 insertions(+), 12 deletions(-)
  16. diff --git a/chat/Makefile.linux b/chat/Makefile.linux
  17. index 0732ec8..f082dab 100644
  18. --- a/chat/Makefile.linux
  19. +++ b/chat/Makefile.linux
  20. @@ -25,7 +25,7 @@ chat.o: chat.c
  21. install: chat
  22. mkdir -p $(BINDIR) $(MANDIR)
  23. - $(INSTALL) -s -c chat $(BINDIR)
  24. + $(INSTALL) -c chat $(BINDIR)
  25. $(INSTALL) -c -m 644 chat.8 $(MANDIR)
  26. clean:
  27. diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
  28. index 9664f70..4e485a1 100644
  29. --- a/pppd/Makefile.linux
  30. +++ b/pppd/Makefile.linux
  31. @@ -107,7 +107,7 @@ ifdef USE_SRP
  32. CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
  33. LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto
  34. TARGETS += srp-entry
  35. -EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
  36. +EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
  37. MANPAGES += srp-entry.8
  38. EXTRACLEAN += srp-entry.o
  39. NEEDDES=y
  40. @@ -219,7 +219,7 @@ all: $(TARGETS)
  41. install: pppd
  42. mkdir -p $(BINDIR) $(MANDIR)
  43. $(EXTRAINSTALL)
  44. - $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
  45. + $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
  46. if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  47. chmod o-rx,u+s $(BINDIR)/pppd; fi
  48. $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
  49. diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
  50. index e702263..af57ae3 100644
  51. --- a/pppd/plugins/radius/Makefile.linux
  52. +++ b/pppd/plugins/radius/Makefile.linux
  53. @@ -36,11 +36,11 @@ all: $(PLUGIN)
  54. install: all
  55. $(INSTALL) -d -m 755 $(LIBDIR)
  56. - $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
  57. - $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
  58. - $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
  59. - $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
  60. - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  61. + $(INSTALL) -c -m 755 radius.so $(LIBDIR)
  62. + $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
  63. + $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
  64. + $(INSTALL) -m 444 pppd-radius.8 $(MANDIR)
  65. + $(INSTALL) -m 444 pppd-radattr.8 $(MANDIR)
  66. radius.so: radius.o libradiusclient.a
  67. $(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a
  68. diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
  69. index 749ccc2..2c93f4a 100644
  70. --- a/pppd/plugins/rp-pppoe/Makefile.linux
  71. +++ b/pppd/plugins/rp-pppoe/Makefile.linux
  72. @@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
  73. install: all
  74. $(INSTALL) -d -m 755 $(LIBDIR)
  75. - $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
  76. + $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
  77. $(INSTALL) -d -m 755 $(BINDIR)
  78. - $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
  79. + $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
  80. clean:
  81. rm -f *.o *.so pppoe-discovery
  82. diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
  83. index cdf7ac4..0457561 100644
  84. --- a/pppdump/Makefile.linux
  85. +++ b/pppdump/Makefile.linux
  86. @@ -17,5 +17,5 @@ clean:
  87. install:
  88. mkdir -p $(BINDIR) $(MANDIR)
  89. - $(INSTALL) -s -c pppdump $(BINDIR)
  90. + $(INSTALL) -c pppdump $(BINDIR)
  91. $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
  92. diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
  93. index 71afbe6..1819370 100644
  94. --- a/pppstats/Makefile.linux
  95. +++ b/pppstats/Makefile.linux
  96. @@ -22,7 +22,7 @@ all: pppstats
  97. install: pppstats
  98. -mkdir -p $(MANDIR)
  99. - $(INSTALL) -s -c pppstats $(BINDIR)
  100. + $(INSTALL) -c pppstats $(BINDIR)
  101. $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
  102. pppstats: $(PPPSTATSRCS)