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

Oops revert wip (using ports libtool) that wasn't meant to be committed.

Browse Source
This commit is contained in:
matthieu 2011-06-02 19:47:33 +00:00
parent d44ab1009a
commit 2dac430ad6
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xorg.mk,v 1.37 2011/06/02 17:01:59 matthieu Exp $ -*- makefile -*- # $OpenBSD: bsd.xorg.mk,v 1.38 2011/06/02 19:47:33 matthieu Exp $ -*- makefile -*-
# #
# Copyright © 2006 Matthieu Herrb # Copyright © 2006 Matthieu Herrb
# #
@ -29,9 +29,6 @@ XSRCDIR?= /usr/xenocara
# Where to build # Where to build
XOBJDIR?= /usr/xobj XOBJDIR?= /usr/xobj
# For libtool replacement
PORTSDIR?= /usr/ports
# Where to install # Where to install
BINDIR?= ${X11BASE}/bin BINDIR?= ${X11BASE}/bin
LIBDIR= ${X11BASE}/lib LIBDIR= ${X11BASE}/lib
@ -67,8 +64,6 @@ AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
$(CONFIGURE_ENV) $(CONFIGURE_ENV)
LIBTOOL= ${PORTSDIR}/infrastructure/bin/libtool
## ##
## Default rules ## Default rules
## ##
@ -146,7 +141,7 @@ _lt_libs+=lib${_n:S/+/_/g:S/-/_/g:S/./_/g}_ltversion=${_v}
.if !target(all) .if !target(all)
all: config.status all: config.status
exec ${MAKE} LIBTOOL=${LIBTOOL} ${_lt_libs} exec ${MAKE} ${_lt_libs}
.endif .endif
@ -195,7 +190,7 @@ afterinstall:
. endif . endif
. if !target(realinstall) . if !target(realinstall)
realinstall: realinstall:
exec ${MAKE} LIBTOOL=${LIBTOOL} ${_lt_libs} install exec ${MAKE} ${_lt_libs} install
.endif .endif
install: maninstall install: maninstall
maninstall: afterinstall maninstall: afterinstall