diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-06-02 19:47:34 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-06-02 19:47:34 +0000 |
| commit | 2c667078396202a352f6ce6ea0317d884364c047 (patch) | |
| tree | 3c2d1e219700e9e2db880e4bcd75e1026360ce91 /share | |
| parent | 72d3b071bb6da720ab639363f65f531c27cbe2ad (diff) | |
Oops revert wip (using ports libtool) that wasn't meant to be committed.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.xorg.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk index 4a3f0105f..b686bf3c2 100644 --- a/share/mk/bsd.xorg.mk +++ b/share/mk/bsd.xorg.mk @@ -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 # @@ -29,9 +29,6 @@ XSRCDIR?= /usr/xenocara # Where to build XOBJDIR?= /usr/xobj -# For libtool replacement -PORTSDIR?= /usr/ports - # Where to install BINDIR?= ${X11BASE}/bin LIBDIR= ${X11BASE}/lib @@ -67,8 +64,6 @@ AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \ $(CONFIGURE_ENV) -LIBTOOL= ${PORTSDIR}/infrastructure/bin/libtool - ## ## Default rules ## @@ -146,7 +141,7 @@ _lt_libs+=lib${_n:S/+/_/g:S/-/_/g:S/./_/g}_ltversion=${_v} .if !target(all) all: config.status - exec ${MAKE} LIBTOOL=${LIBTOOL} ${_lt_libs} + exec ${MAKE} ${_lt_libs} .endif @@ -195,7 +190,7 @@ afterinstall: . endif . if !target(realinstall) realinstall: - exec ${MAKE} LIBTOOL=${LIBTOOL} ${_lt_libs} install + exec ${MAKE} ${_lt_libs} install .endif install: maninstall maninstall: afterinstall |