Skip to content

Commit 1b32740

Browse files
author
oech3
committed
uudoc
1 parent bd3aa71 commit 1b32740

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

GNUmakefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ INSTALLDIR_BIN=$(DESTDIR)$(BINDIR)
4242

4343
# This won't support any directory with spaces in its name, but you can just
4444
# make a symlink without spaces that points to the directory.
45-
# CARGO_BUILD_TARGET should be undefined for native (non-cross) build.
4645
BASEDIR ?= $(shell pwd)
4746
ifdef CARGO_TARGET_DIR
4847
BUILDDIR := $(CARGO_TARGET_DIR)/${PROFILE}
4948
else
5049
BUILDDIR := $(BASEDIR)/target/$(CARGO_BUILD_TARGET)/${PROFILE}
5150
endif
51+
# uudoc should not be cross build
52+
BUILDDIR_UUDOC := $(BASEDIR)/target/$(PROFILE)
5253
PKG_BUILDDIR := $(BUILDDIR)/deps
5354
DOCSDIR := $(BASEDIR)/docs
5455

@@ -387,7 +388,7 @@ build-uudoc:
387388
install-manpages: build-uudoc
388389
mkdir -p $(DESTDIR)$(DATAROOTDIR)/man/man1
389390
$(foreach prog, $(INSTALLEES) $(HASHSUM_PROGS), \
390-
$(BASEDIR)/target/$(PROFILE)/uudoc manpage $(prog) > $(DESTDIR)$(DATAROOTDIR)/man/man1/$(PROG_PREFIX)$(prog).1 $(newline) \
391+
$(BUILDDIR_UUDOC)/uudoc manpage $(prog) > $(DESTDIR)$(DATAROOTDIR)/man/man1/$(PROG_PREFIX)$(prog).1 $(newline) \
391392
)
392393
else
393394
install-manpages:
@@ -400,9 +401,9 @@ install-completions: build-uudoc
400401
mkdir -p $(DESTDIR)$(DATAROOTDIR)/bash-completion/completions
401402
mkdir -p $(DESTDIR)$(DATAROOTDIR)/fish/vendor_completions.d
402403
$(foreach prog, $(INSTALLEES) $(HASHSUM_PROGS) , \
403-
$(BASEDIR)/target/$(PROFILE)/uudoc completion $(prog) zsh > $(DESTDIR)$(DATAROOTDIR)/zsh/site-functions/_$(PROG_PREFIX)$(prog) $(newline) \
404-
$(BASEDIR)/target/$(PROFILE)/uudoc completion $(prog) bash > $(DESTDIR)$(DATAROOTDIR)/bash-completion/completions/$(PROG_PREFIX)$(prog).bash $(newline) \
405-
$(BASEDIR)/target/$(PROFILE)/uudoc completion $(prog) fish > $(DESTDIR)$(DATAROOTDIR)/fish/vendor_completions.d/$(PROG_PREFIX)$(prog).fish $(newline) \
404+
$(BUILDDIR_UUDOC)/uudoc completion $(prog) zsh > $(DESTDIR)$(DATAROOTDIR)/zsh/site-functions/_$(PROG_PREFIX)$(prog) $(newline) \
405+
$(BUILDDIR_UUDOC)/uudoc completion $(prog) bash > $(DESTDIR)$(DATAROOTDIR)/bash-completion/completions/$(PROG_PREFIX)$(prog).bash $(newline) \
406+
$(BUILDDIR_UUDOC)/uudoc completion $(prog) fish > $(DESTDIR)$(DATAROOTDIR)/fish/vendor_completions.d/$(PROG_PREFIX)$(prog).fish $(newline) \
406407
)
407408
else
408409
install-completions:

0 commit comments

Comments
 (0)