diff options
| author | Simon Howard | 2011-05-14 21:47:12 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-05-14 21:47:12 +0000 |
| commit | 75ddea9c27110a1ea7e96b4dc9776dc0998d267b (patch) | |
| tree | 8712b5a6de73502c369ed329092cdde74cedd596 | |
| parent | d07b88e469abbb7c82d10fbe17473d529aaa4388 (diff) | |
| download | chocolate-doom-75ddea9c27110a1ea7e96b4dc9776dc0998d267b.tar.gz chocolate-doom-75ddea9c27110a1ea7e96b4dc9776dc0998d267b.tar.bz2 chocolate-doom-75ddea9c27110a1ea7e96b4dc9776dc0998d267b.zip | |
Fix install of screensaver desktop file.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2338
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/doom-screensaver.desktop.in | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3a2eeca6..24c6e2b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -181,18 +181,18 @@ endif @SDLMIXER_LIBS@ \ @SDLNET_LIBS@ -EXTRA_DIST = \ - icon.c \ - doom-screensaver.desktop.in +EXTRA_DIST = icon.c appdir = $(prefix)/share/applications -app_DATA = @PROGRAM_PREFIX@doom.desktop \ - @PROGRAM_PREFIX@doom-screensaver.desktop +app_DATA = @PROGRAM_PREFIX@doom.desktop -@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop +@PROGRAM_PREFIX@doom.desktop : doom.desktop cp $^ $@ -@PROGRAM_PREFIX@doom.desktop : doom.desktop +screensaverdir = $(prefix)/share/applications/screensavers +screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop + +@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop cp $^ $@ .rc.o: diff --git a/src/doom-screensaver.desktop.in b/src/doom-screensaver.desktop.in index 59a087e4..178575a2 100644 --- a/src/doom-screensaver.desktop.in +++ b/src/doom-screensaver.desktop.in @@ -3,8 +3,8 @@ Encoding=UTF-8 Name=@PACKAGE_NAME@ Comment=@PACKAGE_SHORTDESC@ -TryExec=@PACKAGE_PREFIX@doom -Exec=@PACKAGE_PREFIX@doom +TryExec=@PROGRAM_PREFIX@doom +Exec=@PROGRAM_PREFIX@doom StartupNotify=false Terminal=false Type=Application |