Skip to content

Commit

Permalink
Merge pull request #557 from dtrudg/issue555-39
Browse files Browse the repository at this point in the history
fix: split man generation and install (release-3.9)
  • Loading branch information
dtrudg authored Feb 4, 2022
2 parents e21550b + 6b46c76 commit c20cc5c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
9 changes: 1 addition & 8 deletions mlocal/frags/Makefile.stub
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@

all: $(ALL)

.PHONY: man
man: singularity
@printf " MAN\n"
mkdir -p $(DESTDIR)$(MANDIR)/man1
$(V)$(GO) run $(GO_MODFLAGS) -tags "$(GO_TAGS)" $(GO_GCFLAGS) $(GO_ASMFLAGS) \
$(SOURCEDIR)/cmd/docs/docs.go man --dir $(DESTDIR)$(MANDIR)/man1

.PHONY: collect
collect:
@printf " DEPENDS\n"
Expand Down Expand Up @@ -129,7 +122,7 @@ clean:
$(V)rm -rf $(BUILDDIR)/mergeddeps cscope.* $(CLEANFILES)

.PHONY: install
install: $(INSTALLFILES) man
install: $(INSTALLFILES)
@echo " DONE"

-include $(BUILDDIR)/mergeddeps
16 changes: 16 additions & 0 deletions mlocal/frags/build_cli.mk
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,19 @@ $(remote_config_INSTALL): $(remote_config)
$(V)install -m 0644 $< $@

INSTALLFILES += $(remote_config_INSTALL)

man_pages := $(BUILDDIR)$(MANDIR)/man1
$(man_pages): singularity
@echo " MAN" $@
mkdir -p $@
$(V)$(GO) run $(GO_MODFLAGS) -tags "$(GO_TAGS)" $(GO_GCFLAGS) $(GO_ASMFLAGS) \
$(SOURCEDIR)/cmd/docs/docs.go man --dir $@

man_pages_INSTALL := $(DESTDIR)$(MANDIR)/man1
$(man_pages_INSTALL): $(man_pages)
@echo " INSTALL" $@
$(V)umask 0022 && mkdir -p $@
$(V)install -m 0644 -t $@ $(man_pages)/*

INSTALLFILES += $(man_pages_INSTALL)
ALL += $(man_pages)

0 comments on commit c20cc5c

Please sign in to comment.