commit e1e6794aca82adf32835883c286d406d4e76b5d7
parent 53f8e701155a4c32b52caf991d3c7856e3c38dff
Author: Kris Maglione <jg@suckless.org>
Date: Mon, 28 Sep 2009 17:24:01 -0400
Cleanup pre-install text file filters.
Diffstat:
10 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/cmd/Makefile b/cmd/Makefile
@@ -15,12 +15,6 @@ TARG = wihack \
wmiistartrc
OFILES = util.o
-FILTER = sed "s|CONFPREFIX|$(ETC)|g; \
- s|CONFVERSION|$(CONFVERSION)|g; \
- s|P9PATHS|$(P9PATHS)|g; \
- s|LIBDIR|$(LIBDIR)|g; \
- s|BINSH|$(BINSH)|g; \
- s|AWKPATH|$(AWKPATH)|g"
LDFLAGS += -lfmt -lutf
CFLAGS += $(INCX11)
diff --git a/cmd/wihack.sh b/cmd/wihack.sh
@@ -36,7 +36,7 @@ eval $checkarg
if [ ! -u "`which $1`" -a ! -g "`which $1`" ]
then
export LD_PRELOAD=libwmii_hack.so
- export LD_LIBRARY_PATH="LIBDIR${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+ export LD_LIBRARY_PATH="@LIBDIR@${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
else
unset WMII_HACK_TRANSIENT WMII_HACK_TYPE WMII_HACK_TAGS
fi
diff --git a/cmd/wmii9rc.sh b/cmd/wmii9rc.sh
@@ -1,7 +1,7 @@
#!/bin/sh -f
RC=""
IFS=:
-for i in "$PLAN9" `echo "P9PATHS"`; do
+for i in "$PLAN9" `echo "@P9PATHS@"`; do
if [ -d "$i" -a -x "$i/bin/rc" ]; then
export PLAN9="$i"
RC="$i/bin/rc"
diff --git a/cmd/wmiistartrc.sh b/cmd/wmiistartrc.sh
@@ -1,20 +0,0 @@
-#!BINSH -f
-# start wmiirc
-
-export home="$HOME"
-lconf="$home/.wmiiCONFVERSION"
-gconf="CONFPREFIX/wmiiCONFVERSION"
-
-export WMII_CONFPATH="$lconf:$gconf"
-#export POSIXLY_CORRECT=gnu_hippies
-
-which="$(which which)"
-if wmii9rc; then
- WMIIRC="$(PATH="$WMII_CONFPATH:$PATH" $which rc.wmii)"
-else
- WMIIRC="$(PATH="$WMII_CONFPATH:$PATH" $which wmiirc)"
-fi
-
-mkdir $lconf 2>/dev/null && $gconf/welcome &
-"$WMIIRC" "$@" || exec "$gconf/wmiirc" "$@"
-
diff --git a/man/Makefile b/man/Makefile
@@ -11,11 +11,5 @@ wmiir.1:
$(TARG): Makefile $(ROOT)/mk/wmii.mk header.t2t
-FILTER = sed "s|CONFPREFIX|$(ETC)|g; \
- s|CONFVERSION|$(CONFVERSION)|g; \
- s|P9PATHS|$(P9PATHS)|g; \
- s|AWKPATH|$(AWKPATH)|g; \
- s|VERSION|$(VERSION)|g"
-
include ${ROOT}/mk/man.mk
diff --git a/man/wmii.man1 b/man/wmii.man1
@@ -145,7 +145,7 @@ An action is a shell script in the default setup, but it can
actually be any executable file. It is executed usually by
selecting it from the actions menu. You can customize an action
by copying it from the global action directory
-'CONFPREFIX/wmii-3.5' to '$HOME/.wmii-3.5' and then
+'@CONFPREFIX@/wmii-3.5' to '$HOME/.wmii-3.5' and then
editing the copy to fit your needs. Of course you can also
create your own actions there; make sure that they are
executable.
@@ -431,9 +431,9 @@ them.
: /tmp/ns.$USER.${DISPLAY%.0}/wmii
The wmii socket file which provides a 9P service.
-: CONFPREFIX/wmii-3.5
+: @CONFPREFIX@/wmii@CONFVERSION@
Global action directory.
-: $HOME/.wmii-3.5
+: $HOME/.wmii@CONFVERSION@
User-specific action directory. Actions are first searched here.
:
diff --git a/mk/hdr.mk b/mk/hdr.mk
@@ -18,9 +18,10 @@ MKCFGSH=if test -f $(ROOT)/config.local.mk; then echo $(ROOT)/config.local.mk; e
MKCFG:=${shell $(MKCFGSH)}
MKCFG!=${MKCFGSH}
include $(MKCFG)
+
# and this:
# Try to find a sane shell. /bin/sh is a last resort, because it's
-# usually bash on Linux, which means, it's painfully slow.
+# usually bash on Linux, which means it's painfully slow.
BINSH := $(shell \
if [ -x /bin/dash ]; then echo /bin/dash; \
elif [ -x /bin/ksh ]; then echo /bin/ksh; \
diff --git a/mk/wmii.mk b/mk/wmii.mk
@@ -5,5 +5,13 @@ VERSION := $(shell echo $(VERS))
VERSION != echo $(VERS)
CONFVERSION = -hg
COPYRIGHT = ©2009 Kris Maglione
-CFLAGS += '-DVERSION=\"$(VERSION)\"' '-DCOPYRIGHT=\"$(COPYRIGHT)\"'
+
+CFLAGS += '-DVERSION=\"$(VERSION)\"' '-DCOPYRIGHT=\"$(COPYRIGHT)\"' \
+ '-DCONFVERSION=\"$(CONFVERSION)\"' '-DCONFPREFIX=\"$(ETC)\"'
+FILTER = sed "s|@CONFPREFIX@|$(ETC)|g; \
+ s|@CONFVERSION@|$(CONFVERSION)|g; \
+ s|@P9PATHS@|$(P9PATHS)|g; \
+ s|@LIBDIR@|$(LIBDIR)|g; \
+ s|@BINSH@|$(BINSH)|g; \
+ s|@AWKPATH@|$(AWKPATH)|g"
diff --git a/rc/Makefile b/rc/Makefile
@@ -7,10 +7,4 @@ TARG = rc.wmii \
wmiirc \
welcome
-FILTER = sed "s|CONFPREFIX|$(ETC)|g; \
- s|CONFVERSION|$(CONFVERSION)|g; \
- s|P9PATHS|$(P9PATHS)|g; \
- s|BINSH|$(BINSH)|g; \
- s|AWKPATH|$(AWKPATH)|g"
-
include $(ROOT)/mk/many.mk
diff --git a/rc/wmiirc.sh b/rc/wmiirc.sh
@@ -1,4 +1,4 @@
-#!BINSH -f
+#!@BINSH@ -f
# Configure wmii
wmiiscript=wmiirc # For wmii.sh
. wmii.sh
