From dced178e9dd592d1c415b82a03fafb5dfbdafa1c Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Mon, 19 Oct 2009 17:58:39 -0400 Subject: [PATCH] put a little sanity in pixmap installation This makes pixmaps uninstall correctly and puts them in DATADIR/pixmaps/lttv. --- lttv/modules/gui/lttvwindow/Makefile.am | 22 ------------------- .../gui/lttvwindow/lttvwindow/init_module.c | 2 +- .../gui/lttvwindow/pixmaps/Makefile.am | 4 +++- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/lttv/modules/gui/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/Makefile.am index 9d31aac8..7e6e2918 100644 --- a/lttv/modules/gui/lttvwindow/Makefile.am +++ b/lttv/modules/gui/lttvwindow/Makefile.am @@ -1,25 +1,3 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = lttvwindow pixmaps - -install-data-local: - @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ - for pixmap in $(srcdir)/pixmaps/*.xpm $(srcdir)/pixmaps/*.png; do \ - if test -f $$pixmap; then \ - $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \ - fi \ - done \ - fi - -dist-hook: - if test -d pixmaps; then \ - mkdir $(distdir)/pixmaps; \ - for pixmap in pixmaps/*.xpm pixmaps/*.png; do \ - if test -f $$pixmap; then \ - cp -p $$pixmap $(distdir)/pixmaps; \ - fi \ - done \ - fi - diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c index 7689aa32..cb3f3dc4 100644 --- a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c +++ b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c @@ -119,7 +119,7 @@ static gboolean window_creation_hook(void *hook_data, void *call_data) gtk_set_locale (); gtk_init (<tv_argc, <tv_argv); - add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); + add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps/" PACKAGE); add_pixmap_directory ("pixmaps"); add_pixmap_directory ("../modules/gui/main/pixmaps"); diff --git a/lttv/modules/gui/lttvwindow/pixmaps/Makefile.am b/lttv/modules/gui/lttvwindow/pixmaps/Makefile.am index 30ce5f88..67d76442 100644 --- a/lttv/modules/gui/lttvwindow/pixmaps/Makefile.am +++ b/lttv/modules/gui/lttvwindow/pixmaps/Makefile.am @@ -4,7 +4,9 @@ # Created by Mathieu Desnoyers on September 30, 2003 # -EXTRA_DIST = \ +pixmapsdir = $(datadir)/pixmaps/$(PACKAGE) + +dist_pixmaps_DATA = \ 1downarrow.png\ 1uparrow.png\ edit_add_22.png\ -- 2.34.1