Skip to content

Commit

Permalink
Build: Makefiles: use correct variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
kgaillot committed Feb 23, 2022
1 parent bf8f66d commit 28442e9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions doc/sphinx/Makefile.am
@@ -1,5 +1,5 @@
#
# Copyright 2003-2021 the Pacemaker project contributors
# Copyright 2003-2022 the Pacemaker project contributors
#
# The version control history for this file may have further details.
#
Expand Down Expand Up @@ -165,7 +165,7 @@ all-local:
done

install-data-local: all-local
$(AM_V_AT)for book in $(BOOKS); do \
$(AM_V_at)for book in $(BOOKS); do \
for format in $(BOOK_FORMATS); do \
formatdir="$$book/_build/$$format"; \
for f in `find "$$formatdir" -print`; do \
Expand All @@ -181,7 +181,7 @@ install-data-local: all-local
done

uninstall-local:
$(AM_V_AT)for book in $(BOOKS); do \
$(AM_V_at)for book in $(BOOKS); do \
rm -rf "$(DESTDIR)/$(docdir)/$$book"; \
done
endif
Expand Down
8 changes: 4 additions & 4 deletions etc/Makefile.am
@@ -1,5 +1,5 @@
#
# Copyright 2021 the Pacemaker project contributors
# Copyright 2021-2022 the Pacemaker project contributors
#
# The version control history for this file may have further details.
#
Expand All @@ -24,15 +24,15 @@ EXTRA_DIST = $(foreach f,$(CONFIGS),sysconfig/$(f))

# Don't overwrite user's existing config files
install-data-local:
$(AM_V_AT)$(MKDIR_P) $(DESTDIR)$(configdir)
$(AM_V_AT)for f in $(CONFIGS); do \
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(configdir)
$(AM_V_at)for f in $(CONFIGS); do \
dest="$(DESTDIR)$(configdir)/$$f"; \
[ -e "$$dest" ] && dest="$$dest.new"; \
$(INSTALL_DATA) "$(srcdir)/sysconfig/$$f" "$$dest"; \
done

uninstall-local:
$(AM_V_AT)for f in $(CONFIGS); do \
$(AM_V_at)for f in $(CONFIGS); do \
dest="$(DESTDIR)$(configdir)/$$f"; \
rm -f "$$dest" "$$dest.new"; \
done

0 comments on commit 28442e9

Please sign in to comment.