diff options
author | deischen <deischen@FreeBSD.org> | 2004-01-31 22:18:09 +0000 |
---|---|---|
committer | deischen <deischen@FreeBSD.org> | 2004-01-31 22:18:09 +0000 |
commit | 2eed8d0864256c7fe182dc8f0df426afa1b0d2e0 (patch) | |
tree | 45746843c400138310622fb3cd0650f5afb049e2 /usr.sbin | |
parent | e4c689ab4185a885c8fd3c0e0a424dad44666cf1 (diff) | |
download | FreeBSD-src-2eed8d0864256c7fe182dc8f0df426afa1b0d2e0.zip FreeBSD-src-2eed8d0864256c7fe182dc8f0df426afa1b0d2e0.tar.gz |
Move the checks for whether or not to build pppctl to
the architecture-dependent sections of the Makefile.
Submitted by: ru
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 957297b..0fb5820 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -215,14 +215,6 @@ _ipsend= ipsend _iptest= iptest .endif -.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc64" -.if !defined(NOLIBC_R) -_pppctl= pppctl -.endif -.elif !defined(NOLIBPTHREAD) && ${MACHINE_ARCH} != "powerpc" -_pppctl= pppctl -.endif - .if !defined(NO_LPR) _lpr= lpr .endif @@ -270,6 +262,9 @@ _ndiscvt= ndiscvt _pccard= pccard _pcvt= pcvt _pnpinfo= pnpinfo +.if !defined(NOLIBPTHREAD) +_pppctl= pppctl +.endif _sgsc= sgsc _sicontrol= sicontrol _spkrtest= spkrtest @@ -281,6 +276,9 @@ _zzz= zzz .if ${MACHINE_ARCH} == "alpha" _elf2exe= elf2exe _pnpinfo= pnpinfo +.if !defined(NOLIBC_R) +_pppctl= pppctl +.endif .endif # kgmon: builds, but no kernel profiling @@ -299,6 +297,9 @@ _mount_nwfs= mount_nwfs _mount_smbfs= mount_smbfs _mptable= mptable _pcvt/ispcvt= pcvt/ispcvt +.if !defined(NOLIBPTHREAD) +_pppctl= pppctl +.endif _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz @@ -308,11 +309,17 @@ _zzz= zzz .if !defined(NO_ACPI) _acpi= acpi .endif +.if !defined(NOLIBPTHREAD) +_pppctl= pppctl +.endif _zzz= zzz .endif .if ${MACHINE_ARCH} == "sparc64" _ofwdump= ofwdump +.if !defined(NOLIBC_R) +_pppctl= pppctl +.endif .endif .include <bsd.subdir.mk> |