Skip to content

Commit

Permalink
use reverse-DNS naming for installing *.desktop files
Browse files Browse the repository at this point in the history
This is similar to and consistent with the previous commit, and the
desktop entry specification recommends doing this as well.
  • Loading branch information
chungy committed Sep 7, 2019
1 parent 4ec9978 commit bc50bd1
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
12 changes: 6 additions & 6 deletions configure.ac
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -168,22 +168,22 @@ rpm.spec
data/Makefile data/Makefile
src/Makefile src/Makefile
src/Doom.metainfo.xml src/Doom.metainfo.xml
src/doom.desktop src/Doom.desktop
src/doom-screensaver.desktop src/Doom_Screensaver.desktop
src/doom/Makefile src/doom/Makefile
src/Heretic.metainfo.xml src/Heretic.metainfo.xml
src/heretic.desktop src/Heretic.desktop
src/heretic/Makefile src/heretic/Makefile
src/Hexen.metainfo.xml src/Hexen.metainfo.xml
src/hexen.desktop src/Hexen.desktop
src/hexen/Makefile src/hexen/Makefile
src/resource.rc src/resource.rc
src/setup-res.rc src/setup-res.rc
src/setup/Makefile src/setup/Makefile
src/setup/setup.desktop src/setup/Setup.desktop
src/setup/setup-manifest.xml src/setup/setup-manifest.xml
src/Strife.metainfo.xml src/Strife.metainfo.xml
src/strife.desktop src/Strife.desktop
src/strife/Makefile src/strife/Makefile
textscreen/Makefile textscreen/Makefile
textscreen/examples/Makefile textscreen/examples/Makefile
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
32 changes: 16 additions & 16 deletions src/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ endif
EXTRA_DIST = \ EXTRA_DIST = \
CMakeLists.txt \ CMakeLists.txt \
icon.c \ icon.c \
doom-screensaver.desktop.in \ Doom_Screensaver.desktop.in \
manifest.xml manifest.xml


metainfodir = $(prefix)/share/metainfo metainfodir = $(prefix)/share/metainfo
Expand All @@ -241,28 +241,28 @@ metainfo_DATA = \


appdir = $(prefix)/share/applications appdir = $(prefix)/share/applications
app_DATA = \ app_DATA = \
@PROGRAM_PREFIX@doom.desktop \ @PACKAGE_RDNS@.Doom.desktop \
@PROGRAM_PREFIX@heretic.desktop \ @PACKAGE_RDNS@.Heretic.desktop \
@PROGRAM_PREFIX@hexen.desktop \ @PACKAGE_RDNS@.Hexen.desktop \
@PROGRAM_PREFIX@strife.desktop @PACKAGE_RDNS@.Strife.desktop


@PROGRAM_PREFIX@doom.desktop : doom.desktop @PACKAGE_RDNS@.Doom.desktop : Doom.desktop
cp doom.desktop $@ cp Doom.desktop $@


@PROGRAM_PREFIX@heretic.desktop : heretic.desktop @PACKAGE_RDNS@.Heretic.desktop : Heretic.desktop
cp heretic.desktop $@ cp Heretic.desktop $@


@PROGRAM_PREFIX@hexen.desktop : hexen.desktop @PACKAGE_RDNS@.Hexen.desktop : Hexen.desktop
cp hexen.desktop $@ cp Hexen.desktop $@


@PROGRAM_PREFIX@strife.desktop : strife.desktop @PACKAGE_RDNS@.Strife.desktop : Strife.desktop
cp strife.desktop $@ cp Strife.desktop $@


screensaverdir = $(prefix)/share/applications/screensavers screensaverdir = $(prefix)/share/applications/screensavers
screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop


@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop @PACKAGE_RDNS@.Doom_Screensaver.desktop: Doom_Screensaver.desktop
cp doom-screensaver.desktop $@ cp Doom_Screensaver.desktop $@


CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA) CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA)


Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions src/setup/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ EXTRA_DIST= \
setup_icon.c setup_icon.c


appdir = $(prefix)/share/applications appdir = $(prefix)/share/applications
app_DATA = @PROGRAM_PREFIX@setup.desktop app_DATA = @PACKAGE_RDNS@.Setup.desktop


CLEANFILES = $(app_DATA) CLEANFILES = $(app_DATA)


@PROGRAM_PREFIX@setup.desktop : setup.desktop @PACKAGE_RDNS@.Setup.desktop : Setup.desktop
cp setup.desktop $@ cp Setup.desktop $@


if HAVE_PYTHON if HAVE_PYTHON


Expand Down
File renamed without changes.

0 comments on commit bc50bd1

Please sign in to comment.