Skip to content
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

Jump to bottom

Fix make uninstall #78

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Fix make uninstall #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75fefb1
Fix make uninstall(_all) leaving files unremoved
tuurep Apr 3, 2024
e38bb7a
Fix echoing literal "\n"
tuurep Apr 3, 2024
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
12 changes: 7 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ build_dist_files: $(dist_local/web-greeter.1) $(dist_local/news) $(dist_local/me

# Config files
config/web-greeter := $(abspath ${DESTDIR}/etc/lightdm/web-greeter.yml)
config/lightdm-wrapper := $(abspath ${DESTDIR}/etc/xdg/lightdm/lightdm.conf.d/90-greeter.wrapper.conf)
config/lightdm-wrapper := $(abspath ${DESTDIR}/etc/xdg/lightdm/lightdm.conf.d/90-greeter-wrapper.conf)
config/Xgreeter := $(abspath ${DESTDIR}/etc/lightdm/Xgreeter)

config_local/web-greeter := $(abspath ${INSTALL_ROOT}/etc/lightdm/web-greeter.yml)
Expand Down Expand Up @@ -248,11 +248,13 @@ install: build

# Uninstall everything except themes and web-greeter.yml
uninstall_preserve:
@rm -rf "${DESTDIR_PREFIX}/lib/web-greeter/"
@rm -f "${dist/web-greeter.1}"
@rm -f "${dist/app-desktop}"
@rm -f "${dist/xg-desktop}"
@rm -f "${dist/metainfo}"
@rm -f "${dist/news}"
@rm -f "${dist/app-icon-scalable}"
@rm -f "${config/lightdm-wrapper}"
@rm -f "${config/Xgreeter}"
@rm -f "${bin/web-greeter}"
Expand All @@ -265,14 +267,14 @@ uninstall_preserve:

# Uninstall everything
uninstall_all: uninstall_preserve
@rm -rf "${config/web-greeter}"
@rm -rf "${DESTDIR_PREFIX}/web-greeter/"
@rm -rf "${DESTDIR_PREFIX}/share/web-greeter/"
@rm -f "${config/web-greeter}"

.PHONY: uninstall
uninstall: uninstall_preserve
@echo " Themes are not uninstalled. Remove them manually or use \`make uninstall_all\`:\
@echo -e " Themes are not uninstalled. Remove them manually or use \`make uninstall_all\`:\
\n${DESTDIR_PREFIX}/share/web-greeter"
@echo " web-greeter config was not uninstalled. Remove it manually or use \`make uninstall_all\`:\
@echo -e " web-greeter config was not uninstalled. Remove it manually or use \`make uninstall_all\`:\
\n${config/web-greeter}"

run: $(resources.py)
Expand Down
Loading