summaryrefslogtreecommitdiff
path: root/app/fvwm
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-12-02 16:28:49 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-12-02 16:28:49 +0000
commit6694db7079fd5df62e3db16172f802bfecd28aa3 (patch)
treee3eb384986f129ef9238de6f2e6d514a3e65c706 /app/fvwm
parent44640531be854f98fc0dbc5f7c3c1f79c6dc65da (diff)
Make 'obj' now can make symlinks to /usr/obj/xenocara (or any other
directory designed by XENOCARA_OBJDIR in /etc/mk.conf).
Diffstat (limited to 'app/fvwm')
-rw-r--r--app/fvwm/Makefile.inc2
-rw-r--r--app/fvwm/modules/Makefile.inc2
-rw-r--r--app/fvwm/sample.fvwmrc/Makefile4
3 files changed, 5 insertions, 3 deletions
diff --git a/app/fvwm/Makefile.inc b/app/fvwm/Makefile.inc
index 7fa5758a3..e8000f326 100644
--- a/app/fvwm/Makefile.inc
+++ b/app/fvwm/Makefile.inc
@@ -13,7 +13,7 @@ CFLAGS+= -I${X11BASE}/include -I${.CURDIR} -I${.CURDIR}/.. \
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat
-.include <bsd.obj.mk>
+obj: _xenocara_obj
.if exists(${.CURDIR}/../libs/${__objdir})
LDADD+= -L${X11BASE}/lib -L${.CURDIR}/../libs/${__objdir} -lfvwm
diff --git a/app/fvwm/modules/Makefile.inc b/app/fvwm/modules/Makefile.inc
index 14dd258c4..25d2456fd 100644
--- a/app/fvwm/modules/Makefile.inc
+++ b/app/fvwm/modules/Makefile.inc
@@ -12,7 +12,7 @@ CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/../.. -I${.CURDIR}/../../libs
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat
-.include <bsd.obj.mk>
+obj: _xenocara_obj
.if exists(${.CURDIR}/../../libs/${__objdir})
LDADD+= -L${X11BASE}/lib -L${.CURDIR}/../../libs/${__objdir} -lfvwm
diff --git a/app/fvwm/sample.fvwmrc/Makefile b/app/fvwm/sample.fvwmrc/Makefile
index 082388ace..aaa1b093c 100644
--- a/app/fvwm/sample.fvwmrc/Makefile
+++ b/app/fvwm/sample.fvwmrc/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2006/12/02 16:28:48 matthieu Exp $
.include "../Makefile.inc"
+NOOBJ=Yes
+
depend:
all: