[hackers] [wmii] Fix some build/install errors. || Kris Maglione

changeset: 2641:2150d866e9bc
tag: 3.9-1
parent: 2614:e670d953948f
user: Kris Maglione <maglione.k_AT_gmail.com>
date: Tue May 25 13:57:47 2010 -0400
files: .hgtags cmd/wmii/Makefile man/wmii.1 man/wmii.man1 mk/common.mk mk/hdr.mk
description:
Fix some build/install errors.

diff -r e670d953948f -r 2150d866e9bc .hgtags
--- a/.hgtags Fri May 21 11:12:41 2010 -0400
+++ b/.hgtags Tue May 25 13:57:47 2010 -0400
@@ -26,3 +26,4 @@
 3e6eb12c495970ae6de79159d27cf8a6a40975a1 3.9
 3e6eb12c495970ae6de79159d27cf8a6a40975a1 3.9
 41d8b6a9b0f74055be8babc510c2752b22063719 3.9
+56f39c8082ebda25489598c1c9eb8abbbd8b80c3 3.9-1
diff -r e670d953948f -r 2150d866e9bc cmd/wmii/Makefile
--- a/cmd/wmii/Makefile Fri May 21 11:12:41 2010 -0400
+++ b/cmd/wmii/Makefile Tue May 25 13:57:47 2010 -0400
@@ -36,7 +36,6 @@
         rule \
         printevent\
         screen \
- utf \
         _util \
         view \
         xdnd \
diff -r e670d953948f -r 2150d866e9bc man/wmii.1
--- a/man/wmii.1 Fri May 21 11:12:41 2010 -0400
+++ b/man/wmii.1 Tue May 25 13:57:47 2010 -0400
@@ -157,7 +157,7 @@
 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 '\fB$HOME\fR/.wmii\-3.5' and then
+\&'@CONFPREFIX@/wmii_AT_CONFVERSION@' to '\fB$HOME\fR/.wmii_AT_CONFVERSION@' 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.
@@ -330,10 +330,9 @@
 button pressed over it.
 .TP
  
-
+.RS -8
 For a more comprehensive list of available events, see
 \fIwmii.pdf\fR\fI[2]\fR
-.RS -8
 
 .TP
 ctl
@@ -566,7 +565,8 @@
 @DOCDIR@/wmii.pdf
 
 .P
-\fI[1]\fR http://www.suckless.org/wiki/wmii/tips/9p_tips
+\fI[1]\fR http://www.suckless.org/wiki/wmii/tips/9p_tips
+.P
 \fI[2]\fR @DOCDIR@/wmii.pdf
 
 
diff -r e670d953948f -r 2150d866e9bc man/wmii.man1
--- a/man/wmii.man1 Fri May 21 11:12:41 2010 -0400
+++ b/man/wmii.man1 Tue May 25 13:57:47 2010 -0400
@@ -145,7 +145,7 @@
 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_AT_CONFVERSION@' to '$HOME/.wmii_AT_CONFVERSION@' 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.
@@ -472,6 +472,6 @@
 
 @DOCDIR@/wmii.pdf
 
-[1] http://www.suckless.org/wiki/wmii/tips/9p_tips
+[1] http://www.suckless.org/wiki/wmii/tips/9p_tips +
 [2] @DOCDIR@/wmii.pdf
 
diff -r e670d953948f -r 2150d866e9bc mk/common.mk
--- a/mk/common.mk Fri May 21 11:12:41 2010 -0400
+++ b/mk/common.mk Tue May 25 13:57:47 2010 -0400
@@ -6,16 +6,16 @@
 DOCDIR = $(DOC)
 simpleinstall:
         for f in $(DOCS); do \
- $(INSTALL) 0644 $$f $(DOCDIR)/$$f; \
+ $(INSTALL) 0644 $$f $(DOCDIR) $$f; \
         done
         for f in $(TEXT); do \
- $(INSTALL) 0644 $$f $(DIR)/$$f; \
+ $(INSTALL) 0644 $$f $(DIR) $$f; \
         done
         for f in $(BINARY); do \
- $(INSTALL) -b 0644 $$f $(DIR)/$$f; \
+ $(INSTALL) -b 0644 $$f $(DIR) $$f; \
         done
         for f in $(EXECS); do \
- $(INSTALL) -b 0755 $$f $(DIR)/$$f; \
+ $(INSTALL) -b 0755 $$f $(DIR) $$f; \
         done
 
 cleandep:
diff -r e670d953948f -r 2150d866e9bc mk/hdr.mk
--- a/mk/hdr.mk Fri May 21 11:12:41 2010 -0400
+++ b/mk/hdr.mk Tue May 25 13:57:47 2010 -0400
@@ -93,45 +93,45 @@
 
 INSTALL= _install() { set -e; \
                  dashb=$$1; [ $$1 = -b ] && shift; \
- d=$$(dirname $$3); \
- if [ ! -d $(DESTDIR)$$d ]; then echo MKDIR $$d; mkdir -p $(DESTDIR)$$d; fi; \
+ d=$(DESTDIR)$$3; f=$$d/$$(basename $$4); \
+ if [ ! -d $$d ]; then echo MKDIR $$3; mkdir -p $$d; fi; \
                  echo INSTALL $$($(CLEANNAME) $(BASE)$$2); \
- [ -n "${noisycc}" ] && set -x; \
+ [ -n "$(noisycc)" ] && set -x; \
                  if [ "$$dashb" = -b ]; \
- then cp -f $$2 $(DESTDIR)$$3; \
- else $(FILTER) <$$2 >$(DESTDIR)$$3; \
+ then cp -f $$2 $$f; \
+ else $(FILTER) <$$2 >$$f; \
                  fi; \
- chmod $$1 $(DESTDIR)$$3; \
+ chmod $$1 $$f; \
                  set +x; \
          }; _install
 UNINSTALL= _uninstall() { set -e; \
                    echo UNINSTALL $$($(CLEANNAME) $(BASE)$$2); \
- [ -n "${noisycc}" ] && set -x; \
- rm -f $(DESTDIR)$$3; \
+ [ -n "$(noisycc)" ] && set -x; \
+ rm -f $(DESTDIR)$$3/$$(basename $$4); \
            }; _uninstall
 
 .out.install:
- $(INSTALL) -b 0755 $< $(BIN)/$*
+ $(INSTALL) -b 0755 $< $(BIN) $*
 .out.uninstall:
- $(UNINSTALL) $< $(BIN)/$*
+ $(UNINSTALL) $< $(BIN) $*
 
 .a.install .$(SOEXT).install:
- $(INSTALL) -b 0644 $< $(LIBDIR)/$<
+ $(INSTALL) -b 0644 $< $(LIBDIR) $<
 .a.uninstall .$(SOEXT).uninstall:
- $(UNINSTALL) $< $(LIBDIR)/$<
+ $(UNINSTALL) $< $(LIBDIR) $<
 
 .h.install:
- $(INSTALL) 0644 $< $(INCLUDE)/$<
+ $(INSTALL) 0644 $< $(INCLUDE) $<
 .h.uninstall:
- $(UNINSTALL) $< $(INCLUDE)/$<
+ $(UNINSTALL) $< $(INCLUDE) $<
 
 .pdf.install:
- $(INSTALL) -b 0644 $< $(DOC)/$<
+ $(INSTALL) -b 0644 $< $(DOC) $<
 .pdf.uninstall:
- $(UNINSTALL) $< $(DOC)/$<
+ $(UNINSTALL) $< $(DOC) $<
 
-INSTALMAN= _installman() { man=$${1\#\#*.}; $(INSTALL) 0644 $$1 $(MAN)/man$$man/$$1; }; _installman
-UNINSTALLMAN=_uninstallman() { man=$${1\#\#*.}; $(UNINSTALL) $$1 $(MAN)/man$$man/$$1; }; _uninstallman
+INSTALMAN= _installman() { man=$${1\#\#*.}; $(INSTALL) 0644 $$1 $(MAN)/man$$man $$1; }; _installman
+UNINSTALLMAN=_uninstallman() { man=$${1\#\#*.}; $(UNINSTALL) $$1 $(MAN)/man$$man $$1; }; _uninstallman
 MANSECTIONS=1 2 3 4 5 6 7 8 9
 ${MANSECTIONS:%=.%.install}:
         $(INSTALMAN) $<
Received on Wed May 26 2010 - 12:48:38 UTC