| [c5c522c] | 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.3/pppd/Makefile.linux 2004-11-22 14:43:58.522728670 +0000 |
|---|
| 5 | +++ ppp-2.4.3/pppd/Makefile.linux 2004-11-22 14:47:09.054728322 +0000 |
|---|
| 6 | @@ -8,6 +8,7 @@ |
|---|
| 7 | BINDIR = $(DESTDIR)/sbin |
|---|
| 8 | MANDIR = $(DESTDIR)/share/man/man8 |
|---|
| 9 | INCDIR = $(DESTDIR)/include |
|---|
| 10 | +LIBDIR = $(DESTDIR)/usr/lib/$(shell gcc -print-multi-os-directory 2> /dev/null) |
|---|
| 11 | |
|---|
| 12 | TARGETS = pppd |
|---|
| 13 | |
|---|
| 14 | @@ -32,7 +33,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 | @@ -120,7 +121,7 @@ |
|---|
| 24 | ifneq ($(wildcard /usr/include/crypt.h),) |
|---|
| 25 | CFLAGS += -DHAVE_CRYPT_H=1 |
|---|
| 26 | endif |
|---|
| 27 | -ifneq ($(wildcard /usr/lib/libcrypt.*),) |
|---|
| 28 | +ifneq ($(wildcard $(LIBDIR)/libcrypt.*),) |
|---|
| 29 | LIBS += -lcrypt |
|---|
| 30 | endif |
|---|
| 31 | |
|---|
| 32 | --- ppp-2.4.3/pppd/plugins/Makefile.linux 2004-11-22 14:43:58.528727189 +0000 |
|---|
| 33 | +++ ppp-2.4.3/pppd/plugins/Makefile.linux 2004-11-22 14:54:10.108012609 +0000 |
|---|
| 34 | @@ -7,7 +7,7 @@ |
|---|
| 35 | DESTDIR = @DESTDIR@ |
|---|
| 36 | BINDIR = $(DESTDIR)/sbin |
|---|
| 37 | MANDIR = $(DESTDIR)/share/man/man8 |
|---|
| 38 | -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) |
|---|
| 39 | +LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION) |
|---|
| 40 | |
|---|
| 41 | SUBDIRS := rp-pppoe pppoatm radius |
|---|
| 42 | # Uncomment the next line to include the radius authentication plugin |
|---|
| 43 | If CC supports the "-print-multi-os-directory" option, use it to determine |
|---|
| 44 | where to check for the existence libcrypt. If it doesn't, then we get /usr/lib. |
|---|
| 45 | |
|---|
| 46 | --- ppp-2.4.3/pppd/pathnames.h 2004-03-10 18:52:15.000000000 -0500 |
|---|
| 47 | +++ ppp-2.4.3/pppd/pathnames.h 2004-03-10 18:52:10.000000000 -0500 |
|---|
| 48 | @@ -55,5 +55,5 @@ |
|---|
| 49 | #endif /* __STDC__ */ |
|---|
| 50 | |
|---|
| 51 | #ifdef PLUGIN |
|---|
| 52 | -#define _PATH_PLUGIN "/usr/lib/pppd/" VERSION |
|---|
| 53 | +#define _PATH_PLUGIN LIBDIR "/pppd/" VERSION |
|---|
| 54 | #endif /* PLUGIN */ |
|---|
