mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Have "make install" act more as expected for a desktop application
I'm trying to get subsurface to get closer to becoming a "regular desktop application"; so far this is based on the recommendations and guidelines on OpenSUSE and Fedora. The icon is now named subsurface.svg and make install installs it in the correct location. At runtime subsurface first checks if an icon is installed and if it is it uses that - otherwise it falls back to the old code that tries to read the svg file from the current directory. We also install a subsurface.desktop file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
089ab5e97c
commit
7df7518625
4 changed files with 50 additions and 6 deletions
16
Makefile
16
Makefile
|
|
@ -4,9 +4,18 @@ CC=gcc
|
|||
CFLAGS=-Wall -Wno-pointer-sign -g
|
||||
INSTALL=install
|
||||
|
||||
prefix = $(HOME)
|
||||
# these locations seem to work for SuSE and Fedora
|
||||
# prefix = $(HOME)
|
||||
prefix = /usr
|
||||
DESTDIR = $(prefix)/bin
|
||||
DESKTOPDIR = $(prefix)/share/applications
|
||||
ICONPATH = $(prefix)/share/icons/hicolor
|
||||
ICONDIR = $(ICONPATH)/scalable/apps
|
||||
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
|
||||
|
||||
NAME = subsurface
|
||||
ICONFILE = $(NAME).svg
|
||||
DESKTOPFILE = $(NAME).desktop
|
||||
|
||||
# find libdivecomputer; we don't trust pkg-config here given how young
|
||||
# libdivecomputer still is - so we check /usr/local and /usr and then we
|
||||
|
|
@ -49,6 +58,11 @@ $(NAME): $(OBJS)
|
|||
install: $(NAME)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)
|
||||
$(INSTALL) $(NAME) $(DESTDIR)
|
||||
$(INSTALL) -d -m 755 $(DESKTOPDIR)
|
||||
$(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
|
||||
$(INSTALL) -d -m 755 $(ICONDIR)
|
||||
$(INSTALL) $(ICONFILE) $(ICONDIR)
|
||||
$(gtk_update_icon_cache)
|
||||
|
||||
parse-xml.o: parse-xml.c dive.h
|
||||
$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags` parse-xml.c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue