source: npl/internetserver/poptop_ppp/patches/ppp-2.4.3-lib64.patch @ c5c522c

gcc484ntopperl-5.22
Last change on this file since c5c522c was c5c522c, checked in by Edwin Eefting <edwin@datux.nl>, 8 years ago

initial commit, transferred from cleaned syn3 svn tree
  • Property mode set to 100644
File size: 1.8 KB

  • ppp-2.4.3/pppd/Makefile.linux 

    If CC supports the "-print-multi-os-directory" option, use it to determine
where to check for the existence libcrypt.  If it doesn't, then we get /usr/lib.
     
    88BINDIR = $(DESTDIR)/sbin
    99MANDIR = $(DESTDIR)/share/man/man8
    1010INCDIR = $(DESTDIR)/include
     11LIBDIR = $(DESTDIR)/usr/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
    1112
    1213TARGETS = pppd
    1314
    … …  
    3233
    3334CC = gcc
    3435#
    35 COPTS = -Wall $(RPM_OPT_FLAGS)
     36COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
    3637LIBS = -lutil
    3738
    3839# Uncomment the next 2 lines to include support for Microsoft's
    … …  
    120121ifneq ($(wildcard /usr/include/crypt.h),)
    121122CFLAGS   += -DHAVE_CRYPT_H=1
    122123endif
    123 ifneq ($(wildcard /usr/lib/libcrypt.*),)
     124ifneq ($(wildcard $(LIBDIR)/libcrypt.*),)
    124125LIBS    += -lcrypt
    125126endif
    126127

  • ppp-2.4.3/pppd/plugins/Makefile.linux

     
    77DESTDIR = @DESTDIR@
    88BINDIR = $(DESTDIR)/sbin
    99MANDIR = $(DESTDIR)/share/man/man8
    10 LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
     10LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
    1111
    1212SUBDIRS := rp-pppoe pppoatm radius
    1313# Uncomment the next line to include the radius authentication plugin

  • ppp-2.4.3/pppd/pathnames.h 

    If CC supports the "-print-multi-os-directory" option, use it to determine
where to check for the existence libcrypt.  If it doesn't, then we get /usr/lib.
     
    5555#endif /* __STDC__ */
    5656
    5757#ifdef PLUGIN
    58 #define _PATH_PLUGIN    "/usr/lib/pppd/" VERSION
     58#define _PATH_PLUGIN    LIBDIR "/pppd/" VERSION
    5959#endif /* PLUGIN */
Note: See TracBrowser for help on using the repository browser.