From 444e8c2819bc52a48804c125829f187177af02b4 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Sat, 13 Oct 2007 23:50:10 +0200 Subject: [PATCH] Created a (hopefully) sane way to install desktop data. --- Makefile.am | 2 +- clients/Makefile.am | 5 +---- clients/gtk2/Makefile.am | 7 +----- clients/gui-shell/Makefile.am | 5 +---- configure.in | 1 + share/Makefile.am | 24 +++++++++++++++++++++ .../dolcon.desktop => share/dolcon-gtk.desktop | 2 +- .../dolcon.desktop => share/dolcon-shell.desktop | 2 +- share/dolcon.png | Bin 0 -> 5454 bytes {clients => share}/hellodolda.png | Bin 10 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 share/Makefile.am rename clients/gtk2/dolcon.desktop => share/dolcon-gtk.desktop (84%) rename clients/gui-shell/dolcon.desktop => share/dolcon-shell.desktop (85%) create mode 100644 share/dolcon.png rename {clients => share}/hellodolda.png (100%) diff --git a/Makefile.am b/Makefile.am index 33f89f9..ed048ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS= common daemon include lib clients config po autopackage doc contrib +SUBDIRS= common daemon include lib clients config po autopackage doc contrib share ACLOCAL_AMFLAGS = -I m4 diff --git a/clients/Makefile.am b/clients/Makefile.am index 749421f..81b53bd 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -1,8 +1,5 @@ SUBDIRS=gtk2 tty gnome-trans-applet gaim gui-shell -EXTRA_DIST=hellodolda.png dolda-icon.xpm - -iconsdir = $(datadir)/pixmaps -icons_DATA = hellodolda.png +EXTRA_DIST=dolda-icon.xpm noinst_PROGRAMS=test diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am index 13561ad..298ec86 100644 --- a/clients/gtk2/Makefile.am +++ b/clients/gtk2/Makefile.am @@ -1,8 +1,5 @@ if CLI_GTK2 bin_PROGRAMS=dolcon -if !GUISHELL -app_DATA=dolcon.desktop -endif endif dolcon_SOURCES= dolcon.c \ @@ -14,7 +11,7 @@ dolcon_SOURCES= dolcon.c \ progressbar.c \ progressbar.h -EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc dolcon.desktop +EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc BUILT_SOURCES= mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk @@ -33,5 +30,3 @@ dolcon_CPPFLAGS=@GTK2_CFLAGS@ @LIBXML_CFLAGS@ \ | $(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" >$@ mainwnd.desc: ../../config.h - -appdir=$(datadir)/applications diff --git a/clients/gui-shell/Makefile.am b/clients/gui-shell/Makefile.am index 43e6afc..4400398 100644 --- a/clients/gui-shell/Makefile.am +++ b/clients/gui-shell/Makefile.am @@ -1,13 +1,12 @@ if GUISHELL bin_PROGRAMS=dolcon-launch doldacond-shell -app_DATA=dolcon.desktop endif dolcon_launch_SOURCES=launch.c doldacond_shell_SOURCES=dsh.c -EXTRA_DIST=dsh-start.desc dsh-menu.desc dolcon.desktop +EXTRA_DIST=dsh-start.desc dsh-menu.desc BUILT_SOURCES=dsh-start.gtk dsh-menu.gtk dsh.c: dsh-start.gtk dsh-menu.gtk @@ -24,5 +23,3 @@ doldacond_shell_CPPFLAGS=@GTK2_CFLAGS@ @LIBNOTIFY_CFLAGS@ \ basename="$${target%.gtk}"; \ cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< \ | $(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" >$@ - -appdir=$(datadir)/applications diff --git a/configure.in b/configure.in index d93efa0..daf5d05 100644 --- a/configure.in +++ b/configure.in @@ -279,6 +279,7 @@ config/Makefile config/cmd/Makefile config/util/Makefile contrib/Makefile +share/Makefile autopackage/doldacond.apspec autopackage/dolcon.apspec autopackage/dcuilib.apspec diff --git a/share/Makefile.am b/share/Makefile.am new file mode 100644 index 0000000..90dbd7a --- /dev/null +++ b/share/Makefile.am @@ -0,0 +1,24 @@ +appdir=$(datadir)/applications +iconsdir=$(datadir)/icons/hicolor/48x48/apps + +icons_DATA= + +if GUISHELL +realdesktop=dolcon-shell.desktop +icons_DATA+=dolcon.png +else +if CLI_GTK2 +realdesktop=dolcon-gtk.desktop +icons_DATA+=dolcon.png +else +realdesktop=none +endif +endif + +EXTRA_DIST=hellodolda.png dolda-icon.png dolcon-gtk.desktop dolcon-shell.desktop + +install-data-local: + if [ "$$realdesktop" != none ]; then \ + $(mkinstalldirs) $(DESTDIR)$(appdir); \ + $(INSTALL_DATA) $(srcdir)/$(realdesktop) $(DESTDIR)$(appdir)/dolcon.desktop; \ + fi diff --git a/clients/gtk2/dolcon.desktop b/share/dolcon-gtk.desktop similarity index 84% rename from clients/gtk2/dolcon.desktop rename to share/dolcon-gtk.desktop index 9aaabf0..c751c99 100644 --- a/clients/gtk2/dolcon.desktop +++ b/share/dolcon-gtk.desktop @@ -3,6 +3,6 @@ Encoding=UTF-8 Categories=Network Type=Application Terminal=false -Icon=hellodolda.png +Icon=dolcon Exec=dolcon Name=Dolda Connect diff --git a/clients/gui-shell/dolcon.desktop b/share/dolcon-shell.desktop similarity index 85% rename from clients/gui-shell/dolcon.desktop rename to share/dolcon-shell.desktop index 4aa168f..ccec04a 100644 --- a/clients/gui-shell/dolcon.desktop +++ b/share/dolcon-shell.desktop @@ -3,6 +3,6 @@ Encoding=UTF-8 Categories=Network Type=Application Terminal=false -Icon=hellodolda.png +Icon=dolcon Exec=dolcon-launch Name=Dolda Connect diff --git a/share/dolcon.png b/share/dolcon.png new file mode 100644 index 0000000000000000000000000000000000000000..34edd91f92d2c76e5fd4d8e5e2eb524274cda3ed GIT binary patch literal 5454 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

_%?&rim1U5K z4=#cLZ)+9d%P)WBvm55V`-w)4%3C175QezF{29A_2PBet=7T)*38IP$>>c0l80ZTZ zBK`?wZ6bk;7}-Gp5&@csOJGd|$kr|Gd)l#Mi3Sgj{W-5N5