Module Name: src
Committed By: riz
Date: Mon Aug 8 19:50:30 UTC 2011
Modified Files:
src/share/mk [netbsd-5]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1646):
share/mk/bsd.x11.mk: revision 1.98
Fix the value of "appdefaultdir" that ends up in native X .pc files.
(It should be "app-defaults" but was "app-default", probably because
of a typo; it's been wrong ever since this logic was put in two and a
half years ago, and as app-defaults files are a legacy mechanism it
took this long for anyone to notice.) Should be pulled up to -5.
To generate a diff of this commit:
cvs rdiff -u -r1.70.2.2 -r1.70.2.3 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.70.2.2 src/share/mk/bsd.x11.mk:1.70.2.3
--- src/share/mk/bsd.x11.mk:1.70.2.2 Thu Sep 17 04:24:42 2009
+++ src/share/mk/bsd.x11.mk Mon Aug 8 19:50:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.70.2.2 2009/09/17 04:24:42 snj Exp $
+# $NetBSD: bsd.x11.mk,v 1.70.2.3 2011/08/08 19:50:30 riz Exp $
.include <bsd.init.mk>
@@ -265,7 +265,7 @@
s,@libdir@,\\$$\{prefix\}/lib,; \
s,@includedir@,\\$$\{prefix\}/include,; \
s,@datarootdir@,\\$$\{prefix\}/share,; \
- s,@appdefaultdir@,\\$$\{libdir}/X11/app-default,; \
+ s,@appdefaultdir@,\\$$\{libdir}/X11/app-defaults,; \
s,@MAPDIR@,\\$$\{libdir\}/X11/fonts/util,; \
s,@ICONDIR@,\\$$\{datarootdir\}/icons,; \
s,@PACKAGE_VERSION@,$${_pkg_version},; \
