From: Michael Stapelberg Date: Tue, 11 Dec 2012 21:31:44 +0000 (+0100) Subject: install i3-dmenu-desktop X-Git-Tag: 4.4~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=18e46ffae50a7361454d4efa1bbe4649ab7e915f;p=i3%2Fi3 install i3-dmenu-desktop --- diff --git a/Makefile b/Makefile index 3b675034..b0f49e34 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ dist: distclean [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} [ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2 mkdir i3-${VERSION} - cp i3-migrate-config-to-v4 generate-command-parser.pl i3-sensible-* i3.config.keycodes DEPENDS LICENSE PACKAGE-MAINTAINER RELEASE-NOTES-${VERSION} i3.config i3.xsession.desktop i3.applications.desktop pseudo-doc.doxygen common.mk Makefile i3-${VERSION} + cp i3-migrate-config-to-v4 generate-command-parser.pl i3-sensible-* i3-dmenu-desktop i3.config.keycodes DEPENDS LICENSE PACKAGE-MAINTAINER RELEASE-NOTES-${VERSION} i3.config i3.xsession.desktop i3.applications.desktop pseudo-doc.doxygen common.mk Makefile i3-${VERSION} cp -r src libi3 i3-msg i3-nagbar i3-config-wizard i3bar i3-dump-log yajl-fallback include man parser-specs testcases i3-${VERSION} # Only copy toplevel documentation (important stuff) mkdir i3-${VERSION}/docs diff --git a/common.mk b/common.mk index bb5cf793..de5c7e98 100644 --- a/common.mk +++ b/common.mk @@ -195,6 +195,7 @@ ifeq ($(V),0) # echo-ing vars V_ASCIIDOC = echo ASCIIDOC $@; V_POD2HTML = echo POD2HTML $@; +V_POD2MAN = echo POD2MAN $@; V_A2X = echo A2X $@; endif diff --git a/debian/i3-wm.manpages b/debian/i3-wm.manpages index a1b05bd3..58569b87 100644 --- a/debian/i3-wm.manpages +++ b/debian/i3-wm.manpages @@ -8,4 +8,5 @@ man/i3-migrate-config-to-v4.1 man/i3-sensible-pager.1 man/i3-sensible-editor.1 man/i3-sensible-terminal.1 +man/i3-dmenu-desktop.1 man/i3bar.1 diff --git a/man/man.mk b/man/man.mk index f999dc78..7c5c9858 100644 --- a/man/man.mk +++ b/man/man.mk @@ -1,10 +1,12 @@ DISTCLEAN_TARGETS += clean-mans A2X = a2x +POD2MAN = pod2man A2X_MAN_CALL = $(V_A2X)$(A2X) -f manpage --asciidoc-opts="-f man/asciidoc.conf" $(A2X_FLAGS) $< +POD2MAN_CALL = $(V_POD2MAN)$(POD2MAN) --utf8 $< > $@ -MANS_1 = \ +MANS_ASCIIDOC = \ man/i3.1 \ man/i3bar.1 \ man/i3-msg.1 \ @@ -17,14 +19,21 @@ MANS_1 = \ man/i3-sensible-terminal.1 \ man/i3-dump-log.1 +MANS_POD = \ + man/i3-dmenu-desktop.1 + MANS = \ - $(MANS_1) + $(MANS_ASCIIDOC) \ + $(MANS_POD) mans: $(MANS) -$(MANS_1): %.1: %.man man/asciidoc.conf +$(MANS_ASCIIDOC): %.1: %.man man/asciidoc.conf $(A2X_MAN_CALL) +$(MANS_POD): %.1: i3-dmenu-desktop + $(POD2MAN_CALL) + clean-mans: for file in $(notdir $(MANS)); \ do \ diff --git a/src/i3.mk b/src/i3.mk index 81916394..dedf4e27 100644 --- a/src/i3.mk +++ b/src/i3.mk @@ -87,6 +87,7 @@ install-i3: i3 $(INSTALL) -m 0755 i3-sensible-editor $(DESTDIR)$(PREFIX)/bin/ $(INSTALL) -m 0755 i3-sensible-pager $(DESTDIR)$(PREFIX)/bin/ $(INSTALL) -m 0755 i3-sensible-terminal $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -m 0755 i3-dmenu-desktop $(DESTDIR)$(PREFIX)/bin/ test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m 0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes $(INSTALL) -m 0644 i3.xsession.desktop $(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop