Permalink
Browse files

Fix wmiirc problems in recent commits.

  • Loading branch information...
1 parent 50062c2 commit 42280d258ad3af3a3477fd3e381fad209965cdc5 Kris Maglione committed Oct 13, 2010
Showing with 11 additions and 10 deletions.
  1. +1 −1 alternative_wmiircs/python/wmiirc
  2. +2 −2 cmd/wmii.sh.sh
  3. +1 −1 mk/common.mk
  4. +7 −6 mk/wmii.mk
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env @PYTHON@
import os, sys
path = []
for p in os.environ.get("WMII_CONFPATH", "").split(':'):
View
@@ -96,8 +96,8 @@ wi_events() {
eval=""; [ "$1" = -e ] && eval=1 && shift
_wi_events="$(_wi_text "$@")
$_wi_events"
- # -n "$eval" ] && echo "$_wi_events" | awk "$(_wi_script)" >&2
- [ -n "$eval" ] && eval "$(echo "$_wi_events" | awk "$(_wi_script)")"
+ # -n "$eval" ] && printf %s "$_wi_events" | awk "$(_wi_script)" >&2
+ [ -n "$eval" ] && eval "$(printf %s "$_wi_events" | awk "$(_wi_script)")"
}
wi_events <<'!'
View
@@ -15,7 +15,7 @@ simpleinstall:
$(INSTALL) -b 0644 $$f $(DIR) $$f; \
done
for f in $(EXECS); do \
- $(INSTALL) -b 0755 $$f $(DIR) $$f; \
+ $(INSTALL) 0755 $$f $(DIR) $$f; \
done
simpleuninstall:
View
@@ -24,16 +24,17 @@ CFLAGS += '-DVERSION=\"$(VERSION)\"' '-DCOPYRIGHT=\"$(COPYRIGHT)\"' \
'-DLOCALCONF=\"$(LOCALCONF)\"' '-DGLOBALCONF=\"$(GLOBALCONF)\"' \
-DIXP_NEEDAPI=129
-FILTER = sed "s|@CONFPREFIX@|$(ETC)|g; \
- s|@GLOBALCONF@|$(GLOBALCONF)|g; \
- s|@LOCALCONF@|$(LOCALCONF)|g; \
+FILTER = sed "s|@ALTDOC@|$(DOC)/alternative_wmiircs|g; \
+ s|@BINSH@|$(BINSH)|g; \
s|@CONFDIR@|$(CONFDIR)|g; \
+ s|@CONFPREFIX@|$(ETC)|g; \
s|@DOCDIR@|$(DOC)|g; \
- s|@ALTDOC@|$(DOC)/alternative_wmiircs|g; \
s|@EXAMPLES@|$(DOC)/examples|g; \
- s|@VERSION@|$(VERSION)|g; \
+ s|@GLOBALCONF@|$(GLOBALCONF)|g; \
s|@LIBDIR@|$(LIBDIR)|g; \
- s|@BINSH@|$(BINSH)|g; \
+ s|@LOCALCONF@|$(LOCALCONF)|g; \
+ s|@PYTHON@|$(PYTHON)|g; \
s|@TERMINAL@|$(TERMINAL)|g; \
+ s|@VERSION@|$(VERSION)|g; \
/^@@/d;"

0 comments on commit 42280d2

Please sign in to comment.