diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | TODO | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index ea342bc839..dcce170d35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -706,20 +706,23 @@ man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 +XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} + if ENABLE_MANPAGES -dist_man_MANS = \ +man_MANS = \ $(MANPAGES) \ $(MANPAGES_ALIAS) -XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} - -dist_noinst_DATA = \ +noinst_DATA = \ ${XML_FILES:.xml=.html} +endif EXTRA_DIST += \ - $(XML_FILES) -endif + $(XML_FILES) \ + ${XML_FILES:.xml=.html} \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) systemd_SOURCES = \ src/main.c @@ -2491,7 +2494,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-rootprefix=$$dc_install_base/$(prefix) - upload: all distcheck cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ @@ -49,8 +49,6 @@ Features: * hook up /dev/watchdog with main event loop for embedded, server uses -* man: for some reason the HTML versions of the man pages are currently not being packaged - * when dumping cgroup contents, include main/control PID of a service, explicitly * keep an eye on https://bugzilla.gnome.org/show_bug.cgi?id=670100 |