This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 9cbfcca35fc2e83404d0cb33bfad1f93ad63f3be Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 18:19:05 2014 +0100 xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders. --- x2goserver-xsettings/Makefile | 4 +++- ...erver-xsettings.8 => x2goserver-xsettings.8.in} | 0 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile index 5c710f3..741c79e 100755 --- a/x2goserver-xsettings/Makefile +++ b/x2goserver-xsettings/Makefile @@ -22,7 +22,8 @@ ETC_FILES=$(shell cd etc && echo *) LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) -man_pages = `cd man && find * -type f` +man_pages_pregen=$(shell cd man && find . -type "f" -name "*.in") +man_pages=$(shell cd man && find . -type "f" ! -name "*.in") MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man @@ -40,6 +41,7 @@ build_man2html: if [ -n "$(MAN2HTML_BIN)" ]; then \ mkdir -p $(MAN2HTML_DEST); \ for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ + for man_page in $(man_pages_pregren); do sed -e 's,@@SYSCONFDIR@@,$(ETCDIR),' $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_SRC)/$${man_page%.in}; done; \ for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ fi diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in similarity index 100% rename from x2goserver-xsettings/man/man8/x2goserver-xsettings.8 rename to x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git