commit d05ab41cb6f7dbcaedac12e8ecb646439eeb42a8
parent 2047d9f1abd5afeb846f9605a9356853d5841166
Author: Kris Maglione <jg@suckless.org>
Date: Sun, 20 May 2007 21:22:12 -0400
Add DISTRIBUTERS file.
Diffstat:
6 files changed, 63 insertions(+), 13 deletions(-)
diff --git a/DISTRIBUTERS b/DISTRIBUTERS
@@ -0,0 +1,42 @@
+The following conditions apply to any distribution which
+uses the name wmii. These conditions apply only to wmii
+name, and not to its source code or any other materials.
+
+When in doubt about any of these conditions or other matters
+of packaging or distrobution, , please contact the wmii
+mailing lists <wmii-hackers@suckless.org> or
+<wmii@suckless.org>, or Kris Maglione <fbsdaemon@gmail.com>.
+
+Any binary distribution of wmii MUST have a properly set
+version string. This string may normally be set in
+'mk/wmii.mk', and is set automatically to the Mercurial
+revision number for builds from a Mercurial tree, so long as
+the 'hg' command is present and properly functioning.
+
+Any version which not an official release or snapshot MUST
+be contain the hg revision number in its version string.
+This SHOULD be formated as hgXXXX, where XXXX is the decimal
+revision number.
+
+The version string of any snapshot release MUST contain the
+date of the snapshot in the form YYYYMMDD, and SHOULD
+contain the word snap or snapshot. The version string of a
+snapshot MAY contain the version of a full release that the
+snapshot is expected to lead to, but it MUST be either
+directly preceded, or directly followed by, the word 'pre',
+optionally separated by a non-alphanumeric character,
+including -~_,./, the version.
+
+Any binary distribution which is modified in any non-trivial
+way MUST signify the modifications in its name or version
+string. This includes patches to use Xft for font display,
+but does NOT include minor patches to improve consistency
+with the rest of the system, including changing the default
+terminal emulator or changing any build flags as set in
+config.mk.
+
+Source form distribution MAY include non-trivial patches
+without such modifications, provided that the user is made
+clearly aware of them at build time and/or prompted in some
+way to enable or disable them.
+
diff --git a/Makefile b/Makefile
@@ -1,9 +1,14 @@
ROOT=.
include ${ROOT}/mk/hdr.mk
-DIRS = libixp \
+PDIRS = \
cmd \
rc \
man
+DIRS = libixp \
+ ${PDIRS}
+
include ${ROOT}/mk/dir.mk
+INSTDIRS = ${PDIRS}
+
diff --git a/config.mk b/config.mk
@@ -22,19 +22,19 @@ CC = cc -c
# Linker (Under normal circumstances, this should *not* be 'ld')
LD = cc
# Other
-AR = ar cr
-RANLIB = ranlib
+AR = ar crs
+#AR = sh -c 'ar cr "$$@" && ranlib "$$@"'
-AWKPATH = /usr/bin/awk
P9PATHS = /usr/local/plan9 /usr/local/9 /opt/plan9 /opt/9 /usr/plan9 /usr/9
INCX11 = -I/usr/X11R6/include
LIBX11 = -L/usr/X11R6/lib -lX11
LIBIXP = ${ROOT}/libixp/libixp.a
-LIBIXP = ${LIBDIR}/libixp.a
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = ${LIBS} -R${PREFIX}/lib
#LDFLAGS += -lsocket -lnsl
#CFLAGS += -xtarget=ultra
+#FCALL_H_VERSION=.nounion
+
diff --git a/mk/dir.mk b/mk/dir.mk
@@ -1,5 +1,5 @@
MKSUBDIR = targ=$@; \
- for i in ${DIRS}; do \
+ for i in $$dirs; do \
if [ ! -d $$i ]; then \
echo Skipping nonexistent directory: $$i 1>&2; \
else \
@@ -7,19 +7,23 @@ MKSUBDIR = targ=$@; \
(cd $$i && ${MAKE} BASE="${BASE}$$i/" $${targ\#d}) || exit $?; \
fi; \
done
+
dall:
- ${MKSUBDIR}
+ dirs="${DIRS}"; ${MKSUBDIR}
dclean:
- ${MKSUBDIR}
+ dirs="${DIRS}"; ${MKSUBDIR}
dinstall:
- ${MKSUBDIR}
+ dirs="${INSTDIRS}"; ${MKSUBDIR}
duninstall:
- ${MKSUBDIR}
+ dirs="${INSTDIRS}"; ${MKSUBDIR}
ddepend:
- ${MKSUBDIR}
+ dirs="${DIRS}"; ${MKSUBDIR}
all: dall
clean: dclean
install: dinstall
uninstall: duninstall
depend: ddepend
+
+INSTDIRS = ${DIRS}
+
diff --git a/mk/lib.mk b/mk/lib.mk
@@ -20,6 +20,5 @@ printinstall:
${LIB}: ${OFILES}
@echo AR $@
@${AR} $@ ${OFILES}
- @${RANLIB} $@
include ${ROOT}/mk/common.mk
diff --git a/rc/wmiirc.sh b/rc/wmiirc.sh
@@ -192,11 +192,11 @@ export WMII_MENU WMII_9MENU WMII_FONT WMII_TERM
export WMII_FOCUSCOLORS WMII_SELCOLORS WMII_NORMCOLORS
# Setup Tag Bar
+seltag="$(wmiir read /tag/sel/ctl 2>/dev/null)"
wmiir ls /lbar |
while read bar; do
wmiir remove "/lbar/$bar"
done
-seltag="$(wmiir read /tag/sel/ctl 2>/dev/null)"
wmiir ls /tag | sed -e 's|/||; /^sel$/d' |
while read tag; do
if [ "X$tag" = "X$seltag" ]; then
