[gnome-applets] remove ac-define-dir.m4 and acinclude.m4

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-applets] remove ac-define-dir.m4 and acinclude.m4
Date: Sun, 27 Sep 2015 17:59:53 +0000 (UTC)
commit 59dfd8b4e0eaac7ad356b28133c55d7faaaa944b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Sep 27 19:46:41 2015 +0300

    remove ac-define-dir.m4 and acinclude.m4

 HACKING                            |    8 +------
 Makefile.am                        |    1 -
 accessx-status/Makefile.am         |    2 +-
 accessx-status/pixmaps/Makefile.am |    6 ++--
 battstat/Makefile.am               |    2 +
 brightness/Makefile.am             |    1 +
 configure.ac                       |   35 -------------------------------
 cpufreq/Makefile.am                |    1 +
 cpufreq/pixmaps/Makefile.am        |    8 +++---
 cpufreq/src/Makefile.am            |    2 +
 cpufreq/src/cpufreq-applet.c       |   10 ++++----
 geyes/Makefile.am                  |    6 ++--
 inhibit/Makefile.am                |    1 +
 invest-applet/data/Makefile.am     |    2 +
 invest-applet/data/art/Makefile.am |    6 ++--
 m4/ac-define-dir.m4                |   12 ----------
 m4/acinclude.m4                    |   40 ------------------------------------
 mini-commander/src/Makefile.am     |    6 +++-
 modemlights/Makefile.am            |    8 ++++--
 stickynotes/Makefile.am            |    3 ++
 stickynotes/pixmaps/Makefile.am    |    6 ++--
 tracker-search-bar/Makefile.am     |    1 +
 trashapplet/Makefile.am            |    1 +
 trashapplet/src/Makefile.am        |    1 +
 24 files changed, 47 insertions(+), 122 deletions(-)
---
diff --git a/HACKING b/HACKING
index 0c71197..68e3392 100644
--- a/HACKING
+++ b/HACKING
@@ -87,13 +87,7 @@ Some tips for hacking/debugging the applets:
    will share the static varible. This is described in the debugging
    article, under "Other considerations".
 
-6) Please make use of the global defines already provided for you,
-   rather then defining your own in your Makefile.am. Some useful
-   global defines are GNOME_ICONDIR, GNOME_PIXMAPSDIR,
-   GNOME_LOCALEDIR, GNOME_GLADEDIR, DATADIR, SYSCONFDIR, LIBDIR and
-   VERSION.
-
-7) Attempt to use the Nautilus/GNOME-VFS coding style in
+5) Attempt to use the Nautilus/GNOME-VFS coding style in
    GNOME-Applets. Code should be neatly tabbed, with 8 character tabs,
    and fit on an 80 character wide terminal. Ideally functions
    (will_be_called (LIKE, THIS)); opening braces will be on a new line
diff --git a/Makefile.am b/Makefile.am
index 2524aed..db263a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,6 @@ DIST_SUBDIRS = \
 
 EXTRA_DIST = \
        MAINTAINERS                     \
-       m4/ac-define-dir.m4             \
        COPYING-DOCS
 
 DISTCHECK_CONFIGURE_FLAGS =    \
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 3a5b61e..79b1adb 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = help pixmaps
 libexec_PROGRAMS = accessx-status-applet
 
 accessx_status_applet_CFLAGS = \
-       -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\" \
+       -DACCESSX_PIXMAPS_DIR=\""$(pkgdatadir)/accessx-status-applet/pixmaps"\" \
        -DACCESSX_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
diff --git a/accessx-status/pixmaps/Makefile.am b/accessx-status/pixmaps/Makefile.am
index 2993bd4..ad57594 100644
--- a/accessx-status/pixmaps/Makefile.am
+++ b/accessx-status/pixmaps/Makefile.am
@@ -1,7 +1,7 @@
-accessx_status_iconsdir = $(iconsdir)/hicolor/48x48/apps
+accessx_status_iconsdir = $(datadir)/icons/hicolor/48x48/apps
 accessx_status_icons_DATA = ax-applet.png
 
-accessx_status_pixmapsdir  = $(pixmapsdir)/accessx-status-applet
+accessx_status_pixmapsdir  = $(pkgdatadir)/accessx-status-applet/pixmaps
 accessx_status_pixmaps_DATA =  \
        ax-applet.png                   \
        ax-key-base.png                 \
@@ -40,7 +40,7 @@ accessx_status_pixmaps_DATA = \
        ax-slowkeys-no.png              \
        ax-bouncekeys.png       
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
 update-icon-cache:
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index f381358..8571bfa 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -1,5 +1,6 @@
 NULL =
 
+builderdir = $(pkgdatadir)/builder
 builder_DATA = battstat_applet.ui
 
 ACPIINC= @ACPIINC@
@@ -35,6 +36,7 @@ battstat_applet_2_CFLAGS = \
        -DG_LOG_DOMAIN=\"battstat_applet\"      \
        -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
diff --git a/brightness/Makefile.am b/brightness/Makefile.am
index 51b2733..5b2d1bb 100644
--- a/brightness/Makefile.am
+++ b/brightness/Makefile.am
@@ -9,6 +9,7 @@ gnome_brightness_applet_CFLAGS = \
        -I$(srcdir)                             \
        -DBRIGHTNESS_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
        $(GNOME_APPLETS_CFLAGS)                 \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
diff --git a/configure.ac b/configure.ac
index a2d8a36..a2346db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,10 +327,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
 AM_GLIB_GNU_GETTEXT
 
-# this is the directory where the *.{mo,gmo} files are installed
-gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(gnomelocaledir)
-
 YELP_HELP_INIT
 
 case "$host" in
@@ -621,37 +617,6 @@ fi
 AC_MSG_NOTICE([installing private Python modules in $pythondir])
 AC_SUBST(pythondir)
 
-iconsdir="${datadir}/icons"
-AC_SUBST(iconsdir)
-pixmapsdir="${datadir}/pixmaps"
-AC_SUBST(pixmapsdir)
-pkgdatadir="${datadir}/gnome-applets"
-AC_SUBST(pkgdatadir)
-builderdir="${pkgdatadir}/builder"
-AC_SUBST(builderdir)
-
-AC_DEFINE_DIR(GNOME_ICONDIR, "${iconsdir}", [Gnome Icon Directory])
-AC_DEFINE_DIR(GNOME_PIXMAPSDIR, "${pixmapsdir}", [Gnome Pixmaps Directory])
-AC_DEFINE_DIR(GTK_BUILDERDIR, "${builderdir}", [GtkBuilder Resources Directory])
-AC_DEFINE_DIR(DATADIR, "${datadir}", [datadir])
-AC_DEFINE_DIR(PKG_DATA_DIR, "${pkgdatadir}", [pkgdatadir])
-AC_DEFINE_DIR(SYSCONFDIR, "${sysconfdir}", [sysconfdir])
-AC_DEFINE_DIR(LIBDIR, "${libdir}", [libdir])
-AC_DEFINE_DIR(PREFIX, "$prefix", [install prefix])
-
-AS_AC_EXPAND(DATADIR, "${datadir}")
-AS_AC_EXPAND(PKGDATADIR, "${pkgdatadir}")
-AS_AC_EXPAND(PYTHONDIR, $pythondir)
-AS_AC_EXPAND(BUILDERDIR, $builderdir)
-
-AC_SUBST(VERSION)
-AC_SUBST(PACKAGE)
-AC_SUBST(PKGDATADIR)
-AC_SUBST(DATADIR)
-AC_SUBST(LIBDIR)
-AC_SUBST(PYTHONDIR)
-AC_SUBST(BUILDERDIR)
-
 dnl **************************************************************************
 dnl Process .in files
 dnl **************************************************************************
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 805fd4c..c4d426d 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -37,6 +37,7 @@ org.gnome.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
             -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
+builderdir = $(pkgdatadir)/builder
 builder_DATA = cpufreq-preferences.ui
 
 uidir = $(pkgdatadir)/ui
diff --git a/cpufreq/pixmaps/Makefile.am b/cpufreq/pixmaps/Makefile.am
index fc8f7aa..df4de52 100644
--- a/cpufreq/pixmaps/Makefile.am
+++ b/cpufreq/pixmaps/Makefile.am
@@ -1,5 +1,5 @@
 
-cpufreq_pixmapdir = $(pixmapsdir)/cpufreq-applet
+cpufreq_pixmapdir = $(pkgdatadir)/cpufreq-applet/pixmaps
 cpufreq_pixmap_DATA =          \
        cpufreq-100.png         \
        cpufreq-75.png          \
@@ -30,7 +30,7 @@ uninstall-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
@@ -50,8 +50,8 @@ install-data-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \
-               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/; \
+               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index b7b8bbf..cf4ae3e 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -9,6 +9,8 @@ SUBDIRS = $(selector_SUBDIR)
 cpufreq_applet_CFLAGS = \
        -DCPUFREQ_MENU_UI_DIR=\""$(pkgdatadir)/ui"\"            \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DCPUFREQ_PIXMAPS_DIR=\""$(pkgdatadir)/cpufreq-applet/pixmaps"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
        $(GNOME_APPLETS_CFLAGS)                                 \
        $(LIBGLADE_CFLAGS)                                      \
        $(DBUS_CFLAGS) \
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index 967da83..e7824bf 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -112,11 +112,11 @@ static gboolean cpufreq_applet_factory           (CPUFreqApplet      *applet,
                                                   gpointer            gdata);
 
 static const gchar *const cpufreq_icons[] = {
-        GNOME_PIXMAPSDIR"/cpufreq-applet/cpufreq-25.png",
-        GNOME_PIXMAPSDIR"/cpufreq-applet/cpufreq-50.png",
-        GNOME_PIXMAPSDIR"/cpufreq-applet/cpufreq-75.png",
-        GNOME_PIXMAPSDIR"/cpufreq-applet/cpufreq-100.png",
-        GNOME_PIXMAPSDIR"/cpufreq-applet/cpufreq-na.png",
+        CPUFREQ_PIXMAPS_DIR "/cpufreq-25.png",
+        CPUFREQ_PIXMAPS_DIR "/cpufreq-50.png",
+        CPUFREQ_PIXMAPS_DIR "/cpufreq-75.png",
+        CPUFREQ_PIXMAPS_DIR "/cpufreq-100.png",
+        CPUFREQ_PIXMAPS_DIR "/cpufreq-na.png",
         NULL
 };
 
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index b0b3ce9..9e9a8f3 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -101,7 +101,7 @@ uninstall-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
@@ -121,8 +121,8 @@ install-data-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \
-               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/; \
+               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
diff --git a/inhibit/Makefile.am b/inhibit/Makefile.am
index b977516..06b49a1 100644
--- a/inhibit/Makefile.am
+++ b/inhibit/Makefile.am
@@ -7,6 +7,7 @@ gnome_inhibit_applet_CFLAGS = \
        -I$(srcdir)                             \
        -DINHIBIT_MENU_UI_DIR=\""$(uidir)"\"    \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
        $(GNOME_APPLETS_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
diff --git a/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index d1ac0c0..af13377 100644
--- a/invest-applet/data/Makefile.am
+++ b/invest-applet/data/Makefile.am
@@ -31,6 +31,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 uidir = $(pkgdatadir)/ui
 ui_DATA = \
        invest-applet-menu.xml
+
+builderdir = $(pkgdatadir)/builder
 builder_DATA = \
        prefs-dialog.ui \
        financialchart.ui
diff --git a/invest-applet/data/art/Makefile.am b/invest-applet/data/art/Makefile.am
index 7f304f4..7185618 100644
--- a/invest-applet/data/art/Makefile.am
+++ b/invest-applet/data/art/Makefile.am
@@ -20,7 +20,7 @@ uninstall-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
@@ -40,8 +40,8 @@ install-data-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \
-               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/; \
+               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index ec63de9..56f140a 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -5,6 +5,7 @@ mini_commander_applet_CFLAGS = \
        -I$(srcdir)                     \
        -DMC_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
        $(GNOME_APPLETS_CFLAGS) \
        $(GNOME_INCLUDEDIR) \
        $(WARN_CFLAGS) \
@@ -42,16 +43,17 @@ mini_commander_applet_LDFLAGS = \
 mini_commander_applet_LDADD =  \
        $(GNOME_APPLETS_LIBS)
 
+builderdir = $(pkgdatadir)/builder
 builder_DATA = mini-commander.ui
 
 BITMAPS =                      \
        browser-mini.xpm        \
        history-mini.xpm
 
-desktop_iconsdir = $(iconsdir)/hicolor/48x48/apps
+desktop_iconsdir = $(datadir)/icons/hicolor/48x48/apps
 desktop_icons_DATA = gnome-mini-commander.png
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
 update-icon-cache:
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index 7ba0da1..78042c3 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -5,6 +5,7 @@ modem_applet_CFLAGS = \
        -I$(srcdir) \
        -DMODEM_MENU_UI_DIR=\""$(uidir)"\"              \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
        $(GNOME_APPLETS_CFLAGS)                         \
        $(XML2_CFLAGS) \
        $(WARN_CFLAGS) \
@@ -53,6 +54,7 @@ org.gnome.panel.applet.ModemAppletFactory.service: $(service_in_files)
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
+builderdir = $(pkgdatadir)/builder
 builder_DATA = modemlights.ui
 
 icons = \
@@ -81,7 +83,7 @@ uninstall-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                        echo "Updating Gtk icon cache."; \
@@ -101,8 +103,8 @@ install-data-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \
-               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/; \
+               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index d9bb894..dd9db88 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -17,6 +17,8 @@ if BUILD_STICKYNOTES_APPLET
 stickynotes_applet_CFLAGS = \
        -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
        -I.                                     \
        -I$(srcdir)                             \
        $(GNOME_APPLETS_CFLAGS)                 \
@@ -52,6 +54,7 @@ stickynotes_applet_LDADD =    \
        $(X_LIBS)               \
        $(XML2_LIBS)
 
+builderdir = $(pkgdatadir)/builder
 builder_DATA = $(builder_files)
 
 uidir = $(pkgdatadir)/ui
diff --git a/stickynotes/pixmaps/Makefile.am b/stickynotes/pixmaps/Makefile.am
index 2c4df30..93f8b07 100644
--- a/stickynotes/pixmaps/Makefile.am
+++ b/stickynotes/pixmaps/Makefile.am
@@ -28,7 +28,7 @@ uninstall-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        for icon in $(app_icons); do \
                rm -f $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/$$icon; \
@@ -51,8 +51,8 @@ install-data-local:
                else \
                        SIZE="$${SIZE}x$${SIZE}"; \
                fi; \
-               mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \
-               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
+               mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/; \
+               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/$$FILE; \
        done
        for icon in $(app_icons); do \
                mkdir -p $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/; \
diff --git a/tracker-search-bar/Makefile.am b/tracker-search-bar/Makefile.am
index dd9b4dd..f23c6cc 100644
--- a/tracker-search-bar/Makefile.am
+++ b/tracker-search-bar/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 tracker_search_bar_CFLAGS = \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
        -I.                                     \
        -I$(srcdir)                             \
        $(GNOME_APPLETS_CFLAGS)                 \
diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am
index 4cb07f3..1f543bf 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -24,6 +24,7 @@ org.gnome.panel.applet.TrashAppletFactory.service: $(service_in_files)
 uidir = $(pkgdatadir)/ui
 ui_DATA = trashapplet-menu.xml
 
+builderdir = $(pkgdatadir)/builder
 builder_DATA = trashapplet-empty-progress.ui
 
 EXTRA_DIST = \
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index cf881de..807efc6 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -3,6 +3,7 @@ NULL =
 trashapplet_CPPFLAGS = \
        -DTRASH_MENU_UI_DIR=\""$(pkgdatadir)/ui"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
        -I$(top_srcdir) \
        $(GNOME_APPLETS_CFLAGS) \
        $(GIO_CFLAGS) \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]