diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-08-22 21:20:15 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-08-22 21:20:15 +0200 |
| commit | dabf07e4580b0e378741b3e11b5989e4f0cf17e0 (patch) | |
| tree | c429ffcacb07d6633c14ff1f4e5cdbb59ddeb0bf | |
| parent | 1c4f40213bbb848091dcacd7c5b34f6a45e341a7 (diff) | |
patch 9.1.0687: Makefile may not install desktop filesv9.1.0687
Problem: Makefile may not install desktop files
Solution: Check for "$(DESTDIR)$(DATADIR)" instead of just "$DESTDIR",
which is usually not defined, add uninstall rules for the
icons and the desktop files
closes: #15528
fixes: #15546
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 2da0c6f4af..875a0de6a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2624,7 +2624,7 @@ ICONTHEMEPATH = $(DATADIR)/icons/hicolor DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications KDEPATH = $(HOME)/.kde/share/icons install-icons: - if test -n "$(DESTDIR)"; then \ + if test -n "$(DESTDIR)$(DATADIR)"; then \ $(MKDIR_P) $(ICON48PATH) $(ICON32PATH) \ $(ICON16PATH) $(DESKTOPPATH); \ fi @@ -2845,6 +2845,8 @@ uninstall_runtime: -rm -f $(SYS_OPTWIN_FILE) -rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt -rm -rf $(DEST_COL)/tools + -rm -f $(DESKTOPPATH)/vim.desktop $(DESKTOPPATH)/gvim.desktop + -rm -f $(ICON16PATH)/gvim.png $(ICON32PATH)/gvim.png $(ICON48PATH)/gvim.png -rm -rf $(DEST_COL)/lists -rm -f $(DEST_SYN)/shared/*.vim $(DEST_SYN)/shared/README.txt -rm -f $(DEST_SYN)/modula2/opt/*.vim diff --git a/src/version.c b/src/version.c index 0aa9683eb2..72cce6580a 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 687, +/**/ 686, /**/ 685, |