diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2008-01-02 12:58:05 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2008-01-02 12:58:05 +0000 |
| commit | ff3675ba981c2e65ffc40e4b2402e72be655f43e (patch) | |
| tree | d2e70f4a3337855e40ae3dbf2a15a2dee9c24ca8 /x11-servers/xorg-server/Makefile | |
| parent | f94de7fbd638161c9bc714730aed5d8d87bee1ef (diff) | |
Notes
Diffstat (limited to 'x11-servers/xorg-server/Makefile')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 485a9a823af3..b1cecc309154 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -71,7 +71,7 @@ CONFIGURE_ARGS+= --enable-aiglx=yes CONFIGURE_ARGS+= --enable-aiglx=no .endif -.if !defined(WITHOUT_SUID) || !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO +.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO) CONFIGURE_ARGS+=--enable-install-setuid=yes .else CONFIGURE_ARGS+=--enable-install-setuid=no @@ -79,6 +79,7 @@ CONFIGURE_ARGS+=--enable-install-setuid=no .if ${ARCH} == alpha PLIST_SUB+= ALPHA_NA="@comment " +EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-alpha .else PLIST_SUB+= ALPHA_NA="" .endif @@ -86,6 +87,7 @@ PLIST_SUB+= ALPHA_NA="" .if ${ARCH} == powerpc PLIST_SUB+= PPC_NA="@comment " MAN4+= nv.4x +EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc .else PLIST_SUB+= PPC_NA="" .endif @@ -105,7 +107,7 @@ MAN1+= scanpci.1 PLIST_SUB+= AMD64_I386_SPARC64="@comment " .endif -.if !defined(WITHOUT_SUID) || !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO +.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO) pre-everything:: @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by" @${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper" |