install i3-dmenu-desktop

diff --git a/Makefile b/Makefile
index 3b6750344b9eff42cf6f5f73e0274d773b2f74a1..b0f49e34d4062ba1c04c78e2317a725a8951cf70 100644 (file)
--- 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 bb5cf79346b3b9b06265ad7716f81b263b967b43..de5c7e9894221e01986972caa17c57a89972acbc 100644 (file)
--- 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 a1b05bd3554dc2c33d7270bfc069dd3269759ce2..58569b8711e2ad11c1f5e2e54f86f2b0e39bcc2f 100644 (file)
--- 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 f999dc780d70c856bdd911cd142926e30fe9db8d..7c5c98580d2896f58282014e9a0780d5e20bc91f 100644 (file)
--- 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 81916394578325ae7d10bb9434fd978fda0d4424..dedf4e27b91831f2f1dd0274473acb3a6ac146c9 100644 (file)
--- 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