Skip to content

Fix aggressive "rm -rf" in uninstall target #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix aggressive "rm -rf" in uninstall target #389

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5da0abd
prefer to be explicit when constructing paths
nega0 Feb 11, 2025
a4c90db
fix aggressive "rm -rf" with a less aggressive "rm -rf"
nega0 Feb 11, 2025
e142ff3
remove examples and tests from the install target
nega0 Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ CFG_DIR := $(PREFIX)/etc
BIN_DIR := $(PREFIX)/bin
LIB_DIR := $(PREFIX)/lib/lcov
MAN_DIR := $(PREFIX)/share/man
SHARE_DIR := $(PREFIX)/share/lcov/
SHARE_DIR := $(PREFIX)/share/lcov
SCRIPT_DIR := $(SHARE_DIR)/support-scripts

CFG_INST_DIR := $(DESTDIR)$(CFG_DIR)
Expand Down Expand Up @@ -157,13 +157,6 @@ install:
done ; \
done
mkdir -p $(SHARE_INST_DIR)
for d in example tests ; do \
( cd $$d ; make clean ) ; \
find $$d -type d -exec mkdir -p "$(SHARE_INST_DIR){}" \; ; \
find $$d -type f -exec $(INSTALL) -Dm 644 "{}" "$(SHARE_INST_DIR){}" \; ; \
done ;
@chmod -R ugo+x $(SHARE_INST_DIR)/tests/bin
@find $(SHARE_INST_DIR)/tests \( -name '*.sh' -o -name '*.pl' \) -exec chmod ugo+x {} \;
$(INSTALL) -d -m 755 $(CFG_INST_DIR)
$(call echocmd," INSTALL $(CFG_INST_DIR)/lcovrc")
$(INSTALL) -m 644 lcovrc $(CFG_INST_DIR)/lcovrc
Expand All @@ -180,14 +173,20 @@ uninstall:
$(call echocmd," UNINST $(SCRIPT_INST_DIR)/$$s") \
$(RM) -f $(SCRIPT_INST_DIR)/$$s ; \
done
rmdir --ignore-fail-on-non-empty $(SCRIPT_INST_DIR)
rmdir --ignore-fail-on-non-empty $(SCRIPT_INST_DIR) || true
for l in $(LIBS) ; do \
$(call echocmd," UNINST $(LIB_INST_DIR)/$$l") \
$(RM) -f $(LIB_INST_DIR)/$$l ; \
done
rmdir --ignore-fail-on-non-empty $(LIB_INST_DIR) || true
rmdir `dirname $(LIB_INST_DIR)` || true
rm -rf `dirname $(SHARE_INST_DIR)`
for m in $(MANPAGES) ; do \
$(call echocmd," UNINST $(MAN_INST_DIR)/$$m") \
$(RM) -f $(MAN_INST_DIR)/$$m ; \
done
rmdir --ignore-fail-on-non-empty $(MAN_INST_DIR)/man5 || true
rmdir --ignore-fail-on-non-empty $(MAN_INST_DIR)/man1 || true
rmdir --ignore-fail-on-non-empty $(MAN_INST_DIR) || true
rmdir --ignore-fail-on-non-empty $(SHARE_INST_DIR) || true
$(call echocmd," UNINST $(CFG_INST_DIR)/lcovrc")
$(RM) -f $(CFG_INST_DIR)/lcovrc
rmdir --ignore-fail-on-non-empty $(CFG_INST_DIR) || true
Expand Down
Loading