projects / packages / openl2tp.git / blame
| Commit | Line | Data |
|---|---|---|
| 7e5f9c62 JR |
1 | --- openl2tp-1.8/Makefile~ 2016-10-22 19:35:05.000000000 +0200 |
| 2 | +++ openl2tp-1.8/Makefile 2016-10-22 19:39:02.267356788 +0200 | |
| 3 | @@ -29,28 +29,6 @@ | |
| 4 | # Build for UML environment? | |
| 5 | # UML_TARGET= y | |
| 6 | ||
| 7 | -# Location of shared libs. This is usually /usr/lib, but can be | |
| 8 | -# /usr/lib32 or /usr/lib64 on 64-bit multi-arch systems. On 64-bit | |
| 9 | -# systems which don't have 32-bit multi-arch libs installed, the | |
| 10 | -# standard says build with /usr/lib. But Fedora uses /usr/lib64. We | |
| 11 | -# try to handle these cases by deriving the CPU architecture | |
| 12 | -# name. Things are made more complicated by the fact that the CPU | |
| 13 | -# architecture is output by either uname -m or uname -p, depending on | |
| 14 | -# uname version. Override SYS_LIBDIR from the command line when | |
| 15 | -# necessary. | |
| 16 | -SYS_LIBDIR=/usr/lib | |
| 17 | -ifeq ($(CROSS_COMPILE),) | |
| 18 | - ifeq ($(strip $(wildcard /etc/debian_version*)),) | |
| 19 | - ifeq ($(shell uname -p),x86_64) | |
| 20 | - SYS_LIBDIR=/usr/lib64 | |
| 21 | - else | |
| 22 | - ifeq ($(shell uname -m),x86_64) | |
| 23 | - SYS_LIBDIR=/usr/lib64 | |
| 24 | - endif | |
| 25 | - endif | |
| 26 | - endif | |
| 27 | -endif | |
| 28 | - | |
| 29 | # Points to pppd install. By default, pppd headers are assumed to be | |
| 30 | # in the pppd subdirectory of the compiler's default search path | |
| 31 | # (e.g. /usr/include/pppd). but can be pointed to another directory if | |
| 32 | @@ -62,7 +62,7 @@ | |
| 33 | ||
| 34 | export PPPD_VERSION PPPD_SRCDIR PPPD_LIBDIR READLINE_LDFLAGS READLINE_CFLAGS | |
| 35 | export CROSS_COMPILE AS LD CC AR NM STRIP OBJCOPY OBJDUMP INSTALL UML_TARGET | |
| 36 | -export DESTDIR SYS_LIBDIR | |
| 37 | +export DESTDIR | |
| 38 | ||
| 39 | # Feature options are exported to sub-makes | |
| 40 | export L2TP_FEATURE_LAC_SUPPORT |