summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Klausner <wiz@NetBSD.org>2013-04-04 14:58:30 +0200
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-31 07:54:10 -0700
commit79fd43329e15432bab4f9f8856af385ac2ac0417 (patch)
treeea7f59c0b66f1e9955b1424640296fdb54130e32
parentef3d1d64958c51d7716445574bb7e5653aab714d (diff)
Use xinitrc.d/?*.sh as the matching pattern instead of needing a fragile sed substitution XSLASHGLOB to produce xinitrc.d/*.sh. (If that were used literally the slash-star would confuse cpp.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--cpprules.in1
-rw-r--r--xinitrc.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/cpprules.in b/cpprules.in
index 92a987d..eaea428 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -10,7 +10,6 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
-e '/^[ ]*XHASH/s/XHASH/\#/' \
- -e '/XSLASHGLOB/s/XSLASHGLOB/\/\*/' \
-e '/\@\@$$/s/\@\@$$/\\/'
SUFFIXES = .cpp
diff --git a/xinitrc.cpp b/xinitrc.cpp
index 049a8e4..81c238b 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -85,7 +85,7 @@ XCOMM This is the fallback case if nothing else is executed above
#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
if [ -d XINITDIR/xinitrc.d ] ; then
- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
+ for f in XINITDIR/xinitrc.d/?*.sh ; do
[ -x "$f" ] && . "$f"
done
unset f