summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorveego <veego>2002-04-14 13:59:42 +0000
committerveego <veego>2002-04-14 13:59:42 +0000
commitb42764797cf33d0c510bd428c6c570d08b68a368 (patch)
tree27c0efb181cd1bb26386a1b24bc7d8a2456ad342 /wm
parent37229047e9f77f4caf0e635ddd36dbdd0a872054 (diff)
downloadpkgsrc-b42764797cf33d0c510bd428c6c570d08b68a368.tar.gz
Include mk/bsd.prefs.mk so that FVWM2_USE_GTK and FVWM2_USE_RPLAY can
work if you have that in /etc/mk.conf. Also changce --with-iconpath to --with-imagepath, so the default pixmap and bitmap path is now correct again. That changed some versions ago.
Diffstat (limited to 'wm')
-rw-r--r--wm/fvwm2/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index d368e4e5df9..d29230ce464 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/04/12 09:09:08 martti Exp $
+# $NetBSD: Makefile,v 1.16 2002/04/14 13:59:42 veego Exp $
# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
#
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --enable-extras --without-gnome
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11
CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR}/include
-CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
+CONFIGURE_ARGS+= --with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
post-extract:
${MKDIR} ${WRKDIR}/icons
@@ -56,6 +56,8 @@ post-install:
${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
fi
+.include "../../mk/bsd.prefs.mk"
+
.if defined(FVWM2_USE_GTK) && ${FVWM2_USE_GTK} == "YES"
.include "../../x11/gtk/buildlink.mk"
PLIST_SUBST+= GTK=""