diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-02-07 19:54:56 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-02-07 19:54:56 +0000 |
| commit | 3f49d8a0312dd97ed158dbc63d74b1966eb1349f (patch) | |
| tree | f041f4f01fbeea594cf76b2869ab8f8ac9cc1d24 /Makefile | |
| parent | 56af0aa4eda4d9ad73f1ca6feb00a2f7c6008e53 (diff) | |
Don't install xorg.conf on machines with no X server.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2012/01/16 08:42:38 schwarze Exp $ +# $OpenBSD: Makefile,v 1.44 2012/02/07 19:54:55 matthieu Exp $ .include <bsd.own.mk> LOCALAPPD=/usr/local/lib/X11/app-defaults @@ -42,7 +42,7 @@ beforeinstall: ${MAKE} distrib-dirs ${MAKE} includes -afterinstall: +afterinstall: ${MAKE} install-mk ${MAKE} fix-appd ${MAKE} font-cache @@ -95,8 +95,7 @@ release-clean: release-install: @${MAKE} install -.if ${MACHINE} == alpha || ${MACHINE} == hp300 || \ - ${MACHINE} == mac68k || ${MACHINE} == zaurus +.if ${MACHINE} == zaurus @if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \ echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \ else set -x; \ |