[Xfce4-commits] [apps/xfce4-volumed-pulse] 59/62: Correctly support program renaming

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/xfce4-volumed-pulse.

commit c5f57007bd9c9dec7be42bf1dca43e5ed07190cb
Author: Lionel Le Folgoc <lionel at lefolgoc.net>
Date:   Sun Mar 10 20:53:30 2013 +0100

    Correctly support program renaming
    
    The autostart desktop file is also renamed. This is provided for distributors
    who want to use xfce4-volumed-pulse as a drop-in replacement of xfce4-volumed
    (i.e. invisible transition) instead of shipping both.
---
 configure.ac.in                                         |  5 +++++
 data/Makefile.am                                        | 17 +++++++++++++++--
 ...med-pulse.desktop => xfce4-volumed-pulse.desktop.in} |  2 +-
 src/Makefile.am                                         |  4 +++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index ba08f5b..4d3a524 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -30,6 +30,11 @@ dnl **************************
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
+dnl ********************************
+dnl *** Support program renaming ***
+dnl ********************************
+AC_ARG_PROGRAM()
+
 dnl *******************************
 dnl *** Check for UNIX variants ***
 dnl *******************************
diff --git a/data/Makefile.am b/data/Makefile.am
index 50fd257..6196109 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,22 @@
 # $Id$
 
+package_exec = `echo $(PACKAGE) | sed '$(program_transform_name)'`
+
 autostartdir = $(sysconfdir)/xdg/autostart
 
-autostart_DATA = xfce4-volumed-pulse.desktop
+autostart_in_files = xfce4-volumed-pulse.desktop.in
+%.desktop: %.desktop.in
+	$(AM_V_GEN) sed -e "s^\@PACKAGE_EXEC\@^$(package_exec)^g" < $< > $@
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+
+install-data-hook:
+	if [ x"$(PACKAGE)" != x"$(package_exec)" ]; then \
+		mv $(DESTDIR)/$(autostartdir)/xfce4-volumed-pulse.desktop \
+			$(DESTDIR)/$(autostartdir)/$(package_exec).desktop ; \
+	fi
+
+DISTCLEANFILES = $(autostart_DATA)
 
-EXTRA_DIST = $(autostart_DATA)
+EXTRA_DIST = $(autostart_in_files)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/data/xfce4-volumed-pulse.desktop b/data/xfce4-volumed-pulse.desktop.in
similarity index 89%
rename from data/xfce4-volumed-pulse.desktop
rename to data/xfce4-volumed-pulse.desktop.in
index 72600b4..2b5ed0f 100644
--- a/data/xfce4-volumed-pulse.desktop
+++ b/data/xfce4-volumed-pulse.desktop.in
@@ -3,5 +3,5 @@ Type=Application
 Terminal=false
 Name=XFCE Volume Daemon (Pulseaudio)
 Comment=Daemon managing the volume multimedia keys and displaying volume notifications for Pulseaudio
-Exec=xfce4-volumed-pulse
+Exec=@PACKAGE_EXEC@
 OnlyShowIn=XFCE;
diff --git a/src/Makefile.am b/src/Makefile.am
index 0cf9f78..0cc3b62 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
+package_exec = `echo $(PACKAGE) | sed '$(program_transform_name)'`
+
 INCLUDES = \
 	-I${top_srcdir} \
-	-DG_LOG_DOMAIN=\"xfce4-volumed-pulse\" \
+	-DG_LOG_DOMAIN=\"$(package_exec)\" \
 	$(PLATFORM_CPPFLAGS)
 
 bin_PROGRAMS = \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.