Skip to content

Commit b314a79

Browse files
authored
Merge pull request #1 from Tachi107/man-optional-doc
Make installation of HTML docs optional
2 parents 20faba2 + 73583ec commit b314a79

2 files changed

Lines changed: 32 additions & 10 deletions

File tree

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ MAKE = make
1313
HAVESYSTEMD = yes
1414
HAVEOPENRC = no
1515
HAVEMAN = yes
16+
HAVEDOC = no
1617

1718
INITD = opensysusers.initd
1819

@@ -32,7 +33,7 @@ all: $(INITD)
3233
endif
3334
ifeq ($(HAVEMAN),yes)
3435
all:
35-
+$(MAKE) INSTALL=$(INSTALL) DOCMODE=$(MODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) DESTDIR=$(DESTDIR) -C man
36+
+$(MAKE) HAVEDOC=$(HAVEDOC) INSTALL=$(INSTALL) DOCMODE=$(MODE) MANDIR=$(MANDIR) DOCDIR=$(DOCDIR) DESTDIR=$(DESTDIR) -C man
3637
endif
3738

3839
EDIT = sed "s|@BINNAME[@]|$(BINNAME)|"

man/Makefile

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,49 @@ xsltargs = --nonet \
1111
--stringparam man.copyright.section.enabled 0 \
1212
--stringparam systemd.version 238.51
1313

14-
all:
14+
all: man
15+
ifeq ($(HAVEDOC),yes)
16+
all: doc
17+
endif
18+
19+
man:
1520
xsltproc $(xsltargs) custom-man.xsl systemd-sysusers.xml
16-
xsltproc $(xsltargs) custom-html.xsl systemd-sysusers.xml > systemd-sysusers.html
1721
xsltproc $(xsltargs) custom-man.xsl sysusers.d.xml
18-
xsltproc $(xsltargs) custom-html.xsl sysusers.d.xml > sysusers.d.html
22+
23+
doc:
24+
xsltproc $(xsltargs) -o systemd-sysusers.html custom-html.xsl systemd-sysusers.xml
25+
xsltproc $(xsltargs) -o sysusers.d.html custom-html.xsl sysusers.d.xml
1926

2027
clean:
21-
rm $(manfiles5)
22-
rm $(manfiles8)
23-
rm $(docfiles)
28+
rm -f $(manfiles5)
29+
rm -f $(manfiles8)
30+
rm -f $(docfiles)
2431

25-
install:
32+
install-man:
2633
$(INSTALL) -d $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
2734
$(INSTALL) -m $(DOCMODE) $(manfiles5) $(DESTDIR)$(MANDIR)/man5
2835
$(INSTALL) -m $(DOCMODE) $(manfiles8) $(DESTDIR)$(MANDIR)/man8
36+
37+
install-doc:
2938
$(INSTALL) -d $(DESTDIR)$(DOCDIR)
3039
$(INSTALL) -m $(DOCMODE) $(docfiles) $(DESTDIR)$(DOCDIR)
3140

32-
uninstall:
41+
install: install-man
42+
ifeq ($(HAVEDOC),yes)
43+
install: install-doc
44+
endif
45+
46+
uninstall-man:
3347
for man in ${manfiles5}; do rm -f $(DESTDIR)$(MANDIR)/man5/$$man; done
3448
for man in ${manfiles8}; do rm -f $(DESTDIR)$(MANDIR)/man8/$$man; done
49+
50+
uninstall-doc:
3551
for doc in ${docfiles}; do rm -f $(DESTDIR)$(DOCDIR)/$$doc; done
3652
rm -rf --one-file-system $(DESTDIR)$(DOCDIR)
3753

38-
.PHONY: all install clean
54+
uninstall: uninstall-man
55+
ifeq ($(HAVEDOC),yes)
56+
uninstall: uninstall-doc
57+
endif
58+
59+
.PHONY: all install install-man install-doc clean

0 commit comments

Comments
 (0)