diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | data/misc/Makefile.am | 13 | ||||
| -rw-r--r-- | data/misc/hexchat.desktop.in.in (renamed from data/misc/hexchat.desktop.in) | 2 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 80a93217..ddb49879 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ data/man/hexchat.1 data/pkgconfig/hexchat-plugin.pc data/misc/hexchat.appdata.xml data/misc/hexchat.desktop +data/misc/hexchat.desktop.in data/misc/htm.desktop src/common/dbus/example src/common/dbus/org.hexchat.service.service diff --git a/data/misc/Makefile.am b/data/misc/Makefile.am index 48805ba3..e40c4ba9 100644 --- a/data/misc/Makefile.am +++ b/data/misc/Makefile.am @@ -3,6 +3,15 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml) appdatadir = $(datadir)/appdata @INTLTOOL_XML_RULE@ +if USE_DBUS +exec_command = 'hexchat --existing %U' +else +exec_command = 'hexchat %U' +endif + +hexchat.desktop.in: hexchat.desktop.in.in + $(AM_V_GEN)sed -e s!\@exec_command\@!$(exec_command)! < $< > $@ + data_desktopdir = $(datadir)/applications data_desktop_in_files = hexchat.desktop.in @@ -26,6 +35,6 @@ uninstall-hook: $(UPDATE_MIME_DATABASE); $(UPDATE_DESKTOP_DATABASE); -EXTRA_DIST = hexchat.appdata.xml.in hexchat.desktop.in htm.desktop.in htm-mime.xml +EXTRA_DIST = hexchat.appdata.xml.in hexchat.desktop.in.in htm.desktop.in htm-mime.xml -CLEANFILES = $(appdata_DATA) $(data_desktop_DATA) +CLEANFILES = $(appdata_DATA) $(data_desktop_DATA) hexchat.desktop.in diff --git a/data/misc/hexchat.desktop.in b/data/misc/hexchat.desktop.in.in index bca42665..a778e9b5 100644 --- a/data/misc/hexchat.desktop.in +++ b/data/misc/hexchat.desktop.in.in @@ -3,7 +3,7 @@ _Name=HexChat _GenericName=IRC Client _Comment=Chat with other people online _Keywords=IM;Chat; -Exec=hexchat %U +Exec=@exec_command@ Icon=hexchat Terminal=false Type=Application diff --git a/po/POTFILES.skip b/po/POTFILES.skip new file mode 100644 index 00000000..915e82d8 --- /dev/null +++ b/po/POTFILES.skip @@ -0,0 +1 @@ +data/misc/hexchat.desktop.in.in |