mirror of
https://github.com/0intro/wmii
synced 2024-11-29 09:03:25 +03:00
Fix some bugs in man page filtering.
This commit is contained in:
parent
756230ee93
commit
9787756936
12
man/Makefile
12
man/Makefile
@ -1,14 +1,18 @@
|
|||||||
ROOT=..
|
ROOT=..
|
||||||
include ${ROOT}/mk/hdr.mk
|
include ${ROOT}/mk/hdr.mk
|
||||||
|
include ${ROOT}/mk/wmii.mk
|
||||||
|
|
||||||
TARG = wmii.1 \
|
TARG = wmii.1 \
|
||||||
wmiiloop.1 \
|
wmiiloop.1 \
|
||||||
wmiir.1
|
wmiir.1
|
||||||
|
|
||||||
FILTER = sed "s|CONFPREFIX|${ETC}|g; \
|
$(TARG): Makefile $(ROOT)/mk/wmii.mk
|
||||||
s|CONFVERSION|${CONFVERSION}|g; \
|
|
||||||
s|P9PATHS|${P9PATHS}|g; \
|
FILTER = sed "s|CONFPREFIX|$(ETC)|g; \
|
||||||
s|AWKPATH|${AWKPATH}|g"
|
s|CONFVERSION|$(CONFVERSION)|g; \
|
||||||
|
s|P9PATHS|$(P9PATHS)|g; \
|
||||||
|
s|AWKPATH|$(AWKPATH)|g; \
|
||||||
|
s|VERSION|$(VERSION)|g"
|
||||||
|
|
||||||
include ${ROOT}/mk/man.mk
|
include ${ROOT}/mk/man.mk
|
||||||
|
|
||||||
|
20
mk/hdr.mk
20
mk/hdr.mk
@ -16,7 +16,7 @@ MKCFG!=${MKCFGSH}
|
|||||||
include $(MKCFG)
|
include $(MKCFG)
|
||||||
|
|
||||||
.SILENT:
|
.SILENT:
|
||||||
.SUFFIXES: .O .o .o_pic .c .sh .rc .$(SOEXT) .awk .1 .depend .install .uninstall .clean
|
.SUFFIXES: .O .o .o_pic .c .sh .rc .$(SOEXT) .awk .1 .man1 .depend .install .uninstall .clean
|
||||||
all:
|
all:
|
||||||
|
|
||||||
.c.depend:
|
.c.depend:
|
||||||
@ -28,13 +28,11 @@ all:
|
|||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(COMPILE) $@ $<
|
$(COMPILE) $@ $<
|
||||||
|
|
||||||
.c.o_pic:
|
.c.o_pic:
|
||||||
$(COMPILEPIC) $@ $<
|
$(COMPILEPIC) $@ $<
|
||||||
|
|
||||||
.o.O:
|
.o.O:
|
||||||
$(LINK) $@ $<
|
$(LINK) $@ $<
|
||||||
|
|
||||||
.c.O:
|
.c.O:
|
||||||
$(COMPILE) ${<:.c=.o} $<
|
$(COMPILE) ${<:.c=.o} $<
|
||||||
$(LINK) $@ ${<:.c=.o}
|
$(LINK) $@ ${<:.c=.o}
|
||||||
@ -48,6 +46,9 @@ all:
|
|||||||
echo FILTER $(BASE)$<
|
echo FILTER $(BASE)$<
|
||||||
$(FILTER) $< >$@
|
$(FILTER) $< >$@
|
||||||
chmod 0755 $@
|
chmod 0755 $@
|
||||||
|
.1.man1:
|
||||||
|
echo FILTER $(BASE)$<
|
||||||
|
$(FILTER) $< >$@
|
||||||
|
|
||||||
.O.install:
|
.O.install:
|
||||||
echo INSTALL $$($(CLEANNAME) $(BASE)$*)
|
echo INSTALL $$($(CLEANNAME) $(BASE)$*)
|
||||||
@ -73,11 +74,14 @@ all:
|
|||||||
echo UNINSTALL $$($(CLEANNAME) $(BASE)$<)
|
echo UNINSTALL $$($(CLEANNAME) $(BASE)$<)
|
||||||
rm -f $(INCLUDE)/$<
|
rm -f $(INCLUDE)/$<
|
||||||
|
|
||||||
.1.install:
|
.man1.install:
|
||||||
echo INSTALL man $$($(CLEANNAME) $*'(1)')
|
set -e; \
|
||||||
$(FILTER) $< >$(MAN)/man1/$<
|
man=$(<:$*.man%=%); \
|
||||||
chmod 0644 $(MAN)/man1/$<
|
path="$(MAN)/man$$man/$*.$$man"; \
|
||||||
.1.uninstall:
|
echo INSTALL man $$($(CLEANNAME) "$(BASE)/$*($$man)"); \
|
||||||
|
cp "$<" "$$path"; \
|
||||||
|
chmod 0644 "$$path"
|
||||||
|
.man1.uninstall:
|
||||||
echo UNINSTALL man $$($(CLEANNAME) $*'(1)')
|
echo UNINSTALL man $$($(CLEANNAME) $*'(1)')
|
||||||
rm -f $(MAN)/man1/$<
|
rm -f $(MAN)/man1/$<
|
||||||
|
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
OFILES=$(TARG:.1=.man1)
|
||||||
|
|
||||||
|
all: $(OFILES)
|
||||||
install: ${TARG:.1=.install}
|
install: ${TARG:.1=.install}
|
||||||
uninstall: ${TARG:.1=.uninstall}
|
uninstall: ${TARG:.1=.uninstall}
|
||||||
|
|
||||||
|
@ -1,2 +1,4 @@
|
|||||||
VERSION = $$(hg tip --template 'hg{rev}' 2>/dev/null)
|
VERSION = $$(hg tip --template 'hg{rev}' 2>/dev/null)
|
||||||
|
VERSION := $(shell hg tip --template 'hg{rev}' 2>/dev/null)
|
||||||
|
VERSION != hg tip --template 'hg{rev}' 2>/dev/null
|
||||||
CONFVERSION = 3.5
|
CONFVERSION = 3.5
|
||||||
|
Loading…
Reference in New Issue
Block a user