qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make the install target more similar to what is done in the base system.

Browse Source
This commit is contained in:
matthieu 2006-12-17 20:41:36 +00:00
parent 7ab559b6e3
commit 8cfead4a47
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2006/12/17 20:15:39 matthieu Exp $ # $OpenBSD: Makefile,v 1.9 2006/12/17 20:41:36 matthieu Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
X11BASE?= /usr/X11R6 X11BASE?= /usr/X11R6
@ -30,11 +30,11 @@ beforeinstall:
${MAKE} distrib-dirs ${MAKE} distrib-dirs
${MAKE} includes ${MAKE} includes
afterinstall: install-distrib afterinstall:
cd distrib/notes; ${MAKE} install
/usr/libexec/makewhatis ${DESTDIR}/usr/X11R6/man /usr/libexec/makewhatis ${DESTDIR}/usr/X11R6/man
install-distrib: realinstall: _SUBDIRUSE
cd distrib/notes; ${MAKE} install
release: release-clean distrib-dirs release-install dist release: release-clean distrib-dirs release-install dist
@ -53,7 +53,6 @@ release-clean:
exit 255; \ exit 255; \
fi fi
release-install: release-install:
@${MAKE} install @${MAKE} install
.if ${MACHINE} == alpha || ${MACHINE} == hp300 || ${MACHINE} == mac68k || \ .if ${MACHINE} == alpha || ${MACHINE} == hp300 || ${MACHINE} == mac68k || \
@ -88,7 +87,7 @@ distrib-dirs:
mtree -qdef ${.CURDIR}/etc/mtree/BSD.etc-x11.dist \ mtree -qdef ${.CURDIR}/etc/mtree/BSD.etc-x11.dist \
-p ${DESTDIR}${X11ETC}/ -U -p ${DESTDIR}${X11ETC}/ -U
.PHONY: all build beforeinstall install afterinstall release clean cleandir .PHONY: all build beforeinstall install afterinstall release clean cleandir \
distrib-dirs
.include <bsd.subdir.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

4
app/xdm/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2006/11/29 12:11:47 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.6 2006/12/17 20:41:36 matthieu Exp $
PIXMAPDIR=/etc/X11/xdm/pixmaps PIXMAPDIR=/etc/X11/xdm/pixmaps
@ -9,7 +9,7 @@ CONFIGURE_ARGS= --enable-privsep \
--with-bw-pixmap=OpenBSD_1bpp.xpm \ --with-bw-pixmap=OpenBSD_1bpp.xpm \
--with-color-pixmap=OpenBSD_15bpp.xpm --with-color-pixmap=OpenBSD_15bpp.xpm
extra-install: afterinstall:
$(INSTALL) -c ${.CURDIR}/config/OpenBSD_1bpp.xpm $(DESTDIR)$(PIXMAPDIR) $(INSTALL) -c ${.CURDIR}/config/OpenBSD_1bpp.xpm $(DESTDIR)$(PIXMAPDIR)
$(INSTALL) -c ${.CURDIR}/config/OpenBSD_4bpp.xpm $(DESTDIR)$(PIXMAPDIR) $(INSTALL) -c ${.CURDIR}/config/OpenBSD_4bpp.xpm $(DESTDIR)$(PIXMAPDIR)
$(INSTALL) -c ${.CURDIR}/config/OpenBSD_8bpp.xpm $(DESTDIR)$(PIXMAPDIR) $(INSTALL) -c ${.CURDIR}/config/OpenBSD_8bpp.xpm $(DESTDIR)$(PIXMAPDIR)

23
share/mk/bsd.xorg.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xorg.mk,v 1.8 2006/12/02 16:28:48 matthieu Exp $ -*- makefile -*- # $OpenBSD: bsd.xorg.mk,v 1.9 2006/12/17 20:41:36 matthieu Exp $ -*- makefile -*-
# #
# Copyright © 2006 Matthieu Herrb # Copyright © 2006 Matthieu Herrb
# #
@ -53,7 +53,7 @@ MAKE_ENV+= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
.endif .endif
.if !target(includes) .if !target(includes)
includes: includes: _SUBDIRUSE
.endif .endif
.if defined(SHARED_LIBS) .if defined(SHARED_LIBS)
@ -96,13 +96,20 @@ depend:
.endif .endif
.if !target(install) .if !target(install)
install:: . if !target(beforeinstall)
beforeinstall:
. endif
. if !target(afterinstall)
afterinstall:
. endif
. if !target(realinstall)
realinstall:
${MAKE_ENV} ${MAKE} ${_lt_libs} install ${MAKE_ENV} ${MAKE} ${_lt_libs} install
.endif .endif
install: maninstall
.if target(extra-install) maninstall: afterinstall
install:: afterinstall: realinstall
cd ${.CURDIR} && ${MAKE_ENV} ${MAKE} -f Makefile.bsd-wrapper extra-install realinstall: beforeinstall
.endif .endif
.if !target(dist) .if !target(dist)
@ -189,3 +196,5 @@ _xenocara_obj! _SUBDIRUSE
.if !target(obj) .if !target(obj)
obj: _xenocara_obj obj: _xenocara_obj
.endif .endif
.include <bsd.subdir.mk>