Module Name: src
Committed By: apb
Date: Mon Aug 25 10:25:53 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libXcursor: Makefile
Log Message:
Fix error in previous. The sed command really wants one long line.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXcursor/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXcursor/Makefile
diff -u src/external/mit/xorg/lib/libXcursor/Makefile:1.5 src/external/mit/xorg/lib/libXcursor/Makefile:1.6
--- src/external/mit/xorg/lib/libXcursor/Makefile:1.5 Sun Aug 24 18:27:17 2014
+++ src/external/mit/xorg/lib/libXcursor/Makefile Mon Aug 25 10:25:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/08/24 18:27:17 apb Exp $
+# $NetBSD: Makefile,v 1.6 2014/08/25 10:25:53 apb Exp $
.include <bsd.own.mk>
@@ -13,9 +13,9 @@ INCS= Xcursor.h
INCSDIR=${X11INCDIR}/X11/Xcursor
MAN= Xcursor.3
-X11EXTRAMANDEFS+= -e 's%__XCURSORPATH__%~/.icons,' \
- -e '/usr/share/icons, /usr/share/pixmaps,' \
- -e '${X11LIBDIR}/icons%g'
+__XCURSORPATH__ = ~/.icons, /usr/share/icons, /usr/share/pixmaps, \
+ ${X11LIBDIR}/icons
+X11EXTRAMANDEFS+= -e s%__XCURSORPATH__%${__XCURSORPATH__:Q}%g
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\"
