put a little sanity in pixmap installation

This makes pixmaps uninstall correctly and puts them in DATADIR/pixmaps/lttv.

diff --git a/lttv/modules/gui/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/Makefile.am
index 9d31aac83403a0cf8b037dac06f6afd72de34749..7e6e2918e648bbd0376a3aa5af7b415a903c655c 100644 (file)
--- 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 7689aa32abc39c9941131cb3e85edaea7114bd81..cb3f3dc4cee1522ded2f8768d7451f73ec0bc2ba 100644 (file)
--- 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 (&lttv_argc, &lttv_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 30ce5f88af776c1c688cb2a06291b3ca2df0e8b7..67d764422042fdd749fe9444355c9953771e7606 100644 (file)
--- 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\