Module Name: src
Committed By: dholland
Date: Sun Jul 3 22:59:46 UTC 2011
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
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.97 -r1.98 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.97 src/share/mk/bsd.x11.mk:1.98
--- src/share/mk/bsd.x11.mk:1.97 Mon Apr 11 23:03:38 2011
+++ src/share/mk/bsd.x11.mk Sun Jul 3 22:59:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.97 2011/04/11 23:03:38 joerg Exp $
+# $NetBSD: bsd.x11.mk,v 1.98 2011/07/03 22:59:46 dholland Exp $
.include <bsd.init.mk>
@@ -273,7 +273,7 @@
s,@includedir@,\\$$\{prefix\}/include,; \
s,@datarootdir@,\\$$\{prefix\}/share,; \
s,@datadir@,\\$$\{datarootdir\},; \
- 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},; \