More fixes:

- install bsd.xorg.mk in DESTDIR in postinstall
- don't use dependencies in postinstall
pull/1/head
matthieu 2006-12-31 13:55:44 +00:00
parent 8290fb00dd
commit 9c0ccbe133
1 changed files with 10 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2006/12/31 10:52:07 matthieu Exp $
# $OpenBSD: Makefile,v 1.14 2006/12/31 13:55:44 matthieu Exp $
.include <bsd.own.mk>
LOCALAPPD=/usr/local/lib/X11/app-defaults
@ -9,9 +9,6 @@ SUBDIR= proto data/bitmaps lib app data/xkbdata xserver driver util doc
.ifndef NOFONTS
SUBDIR+= font
.endif
.ifmake(install)
SUBDIR+= share/mk
.endif
NOOBJ=
@ -32,12 +29,20 @@ beforeinstall:
${MAKE} distrib-dirs
${MAKE} includes
afterinstall: fix-appd
afterinstall:
${MAKE} install-mk
${MAKE} fix-appd
cd distrib/notes; ${MAKE} install
/usr/libexec/makewhatis ${DESTDIR}/usr/X11R6/man
realinstall: _SUBDIRUSE
install-mk:
.if defined(DESTDIR) && (${DESTDIR} != "" || ${DESTDIR} != "/")
cd ${.CURDIR}/share/mk \
&& ${MAKE} X11BASE=${X11BASE} install
.endif
fix-appd:
# Make sure /usr/local/lib/X11/app-defaults is a link
if [ ! -L $(DESTDIR)${LOCALAPPD} ]; then \