ppp-alt/ppp-2.4.2-lib64.patch

   1 If CC supports the "-print-multi-os-directory" option, use it to determine
   2 where to check for the existence libcrypt.  If it doesn't, then we get /usr/lib.
   3
   4 --- ppp-2.4.2/pppd/Makefile.linux       2003-11-27 16:55:19.000000000 -0500
   5 +++ ppp-2.4.2/pppd/Makefile.linux       2004-03-10 17:44:04.000000000 -0500
   6 @@ -7,6 +7,7 @@
   7  BINDIR = $(DESTDIR)/usr/sbin
   8  MANDIR = $(DESTDIR)/usr/share/man
   9  INCDIR = $(DESTDIR)/usr/include
  10 +LIBDIR = $(DESTDIR)/$(libdir)
  11
  12  TARGETS = pppd
  13
  14 @@ -31,7 +32,7 @@
  15
  16  CC = gcc
  17  #
  18 -COPTS = -Wall $(RPM_OPT_FLAGS)
  19 +COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(libdir)"\"
  20  LIBS = -lutil
  21
  22  # Uncomment the next 2 lines to include support for Microsoft's
  23 @@ -119,7 +120,7 @@
  24  ifneq ($(wildcard /usr/include/crypt.h),)
  25  CFLAGS   += -DHAVE_CRYPT_H=1
  26  endif
  27 -ifneq ($(wildcard /usr/lib/libcrypt.so),)
  28 +ifneq ($(wildcard $(libdir)/libcrypt.*),)
  29  LIBS   += -lcrypt
  30  endif
  31
  32 --- ppp-2.4.2/pppd/plugins/Makefile.linux       2004-03-10 18:40:27.000000000 -0500
  33 +++ ppp-2.4.2/pppd/plugins/Makefile.linux       2004-03-10 18:41:20.000000000 -0500
  34 @@ -21,7 +21,7 @@
  35         $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
  36
  37  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
  38 -LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION)
  39 +LIBDIR = $(DESTDIR)/$(libdir)/pppd/$(VERSION)
  40
  41  install: $(PLUGINS)
  42         $(INSTALL) -d $(LIBDIR)
  43 --- ppp-2.4.2/pppd/pathnames.h  2004-03-10 18:52:15.000000000 -0500
  44 +++ ppp-2.4.2/pppd/pathnames.h  2004-03-10 18:52:10.000000000 -0500
  45 @@ -55,5 +55,5 @@
  46  #endif /* __STDC__ */
  47
  48  #ifdef PLUGIN
  49 -#define _PATH_PLUGIN   "/usr/lib/pppd/" VERSION
  50 +#define _PATH_PLUGIN   LIBDIR "/pppd/" VERSION
  51  #endif /* PLUGIN */