Don't define directories in configure. Remove some obsolete defines, and
2007-02-02 Christian Persch <chpe@svn.gnome.org> * Makefile.am: * capplets/about-me/Makefile.am: * capplets/about-me/gnome-about-me-password.c: (passdlg_init): * capplets/about-me/gnome-about-me.c: (about_me_setup_dialog): * capplets/accessibility/at-properties/Makefile.am: * capplets/accessibility/keyboard/Makefile.am: * capplets/accessibility/keyboard/accessibility-keyboard.c: (setup_accessX_dialog): * capplets/background/Makefile.am: * capplets/background/gnome-wp-capplet.c: (gnome_wp_create_dialog): * capplets/common/Makefile.am: * capplets/common/capplet-util.c: (capplet_set_icon): * capplets/default-applications/Makefile.am: * capplets/display/Makefile.am: * capplets/file-types/Makefile.am: * capplets/file-types/file-types-capplet.c: (create_dialog): * capplets/file-types/mime-category-edit-dialog.c: (mime_category_edit_dialog_init): * capplets/file-types/mime-edit-dialog.c: (mime_edit_dialog_init): * capplets/file-types/service-edit-dialog.c: (service_edit_dialog_init): * capplets/font/Makefile.am: * capplets/keybindings/Makefile.am: * capplets/keybindings/gnome-keybinding-properties.c: (create_dialog): * capplets/keyboard/Makefile.am: * capplets/keyboard/gnome-keyboard-properties-xkblt.c: (xkb_layout_choose): * capplets/keyboard/gnome-keyboard-properties-xkbmc.c: (choose_model): * capplets/keyboard/gnome-keyboard-properties.c: (create_dialog): * capplets/localization/Makefile.am: * capplets/localization/gnome-localization-properties.c: (create_dialog): * capplets/mime-type/Makefile.am: * capplets/mouse/Makefile.am: * capplets/mouse/gnome-mouse-properties.c: (create_dialog): * capplets/network/Makefile.am: * capplets/network/gnome-network-preferences.c: (cb_http_details_button_clicked), (main): * capplets/rollback/Makefile.am: * capplets/sound/Makefile.am: * capplets/sound/sound-properties-capplet.c: (create_dialog), (device_test_button_clicked): * capplets/theme-switcher/Makefile.am: * capplets/ui-properties/Makefile.am: * capplets/ui-properties/gnome-ui-properties.c: (create_dialog): * capplets/url-properties/Makefile.am: * capplets/windows/Makefile.am: * capplets/wm-properties/wm-desktops/Makefile.am: * configure.in: * gnome-settings-daemon/Makefile.am: * gnome-settings-daemon/actions/Makefile.am: * gnome-settings-daemon/gnome-settings-xmodmap.c: (gnome_settings_modmap_dialog_call): * gnome-settings-daemon/gnome-settings-xrdb.c: * gnome-settings-daemon/gsd-media-keys-window.c: (action_changed), (gsd_media_keys_window_init): * gnome-settings-daemon/xrdb/Makefile.am: * typing-break/Makefile.am: * vfs-methods/themus/Makefile.am: Don't define directories in configure. Remove some obsolete defines, and use the standard installation paths. Bug #395383. svn path=/trunk/; revision=7226
This commit is contained in:
Christian Persch
Christian Persch
parent
76cbf39631
commit
43d40d7a0a
51 changed files with 202 additions and 137 deletions
66
ChangeLog
66
ChangeLog
|
|
@ -1,3 +1,69 @@
|
|||
2007-02-02 Christian Persch <chpe@svn.gnome.org>
|
||||
|
||||
* Makefile.am:
|
||||
* capplets/about-me/Makefile.am:
|
||||
* capplets/about-me/gnome-about-me-password.c: (passdlg_init):
|
||||
* capplets/about-me/gnome-about-me.c: (about_me_setup_dialog):
|
||||
* capplets/accessibility/at-properties/Makefile.am:
|
||||
* capplets/accessibility/keyboard/Makefile.am:
|
||||
* capplets/accessibility/keyboard/accessibility-keyboard.c:
|
||||
(setup_accessX_dialog):
|
||||
* capplets/background/Makefile.am:
|
||||
* capplets/background/gnome-wp-capplet.c: (gnome_wp_create_dialog):
|
||||
* capplets/common/Makefile.am:
|
||||
* capplets/common/capplet-util.c: (capplet_set_icon):
|
||||
* capplets/default-applications/Makefile.am:
|
||||
* capplets/display/Makefile.am:
|
||||
* capplets/file-types/Makefile.am:
|
||||
* capplets/file-types/file-types-capplet.c: (create_dialog):
|
||||
* capplets/file-types/mime-category-edit-dialog.c:
|
||||
(mime_category_edit_dialog_init):
|
||||
* capplets/file-types/mime-edit-dialog.c: (mime_edit_dialog_init):
|
||||
* capplets/file-types/service-edit-dialog.c:
|
||||
(service_edit_dialog_init):
|
||||
* capplets/font/Makefile.am:
|
||||
* capplets/keybindings/Makefile.am:
|
||||
* capplets/keybindings/gnome-keybinding-properties.c:
|
||||
(create_dialog):
|
||||
* capplets/keyboard/Makefile.am:
|
||||
* capplets/keyboard/gnome-keyboard-properties-xkblt.c:
|
||||
(xkb_layout_choose):
|
||||
* capplets/keyboard/gnome-keyboard-properties-xkbmc.c:
|
||||
(choose_model):
|
||||
* capplets/keyboard/gnome-keyboard-properties.c: (create_dialog):
|
||||
* capplets/localization/Makefile.am:
|
||||
* capplets/localization/gnome-localization-properties.c:
|
||||
(create_dialog):
|
||||
* capplets/mime-type/Makefile.am:
|
||||
* capplets/mouse/Makefile.am:
|
||||
* capplets/mouse/gnome-mouse-properties.c: (create_dialog):
|
||||
* capplets/network/Makefile.am:
|
||||
* capplets/network/gnome-network-preferences.c:
|
||||
(cb_http_details_button_clicked), (main):
|
||||
* capplets/rollback/Makefile.am:
|
||||
* capplets/sound/Makefile.am:
|
||||
* capplets/sound/sound-properties-capplet.c: (create_dialog),
|
||||
(device_test_button_clicked):
|
||||
* capplets/theme-switcher/Makefile.am:
|
||||
* capplets/ui-properties/Makefile.am:
|
||||
* capplets/ui-properties/gnome-ui-properties.c: (create_dialog):
|
||||
* capplets/url-properties/Makefile.am:
|
||||
* capplets/windows/Makefile.am:
|
||||
* capplets/wm-properties/wm-desktops/Makefile.am:
|
||||
* configure.in:
|
||||
* gnome-settings-daemon/Makefile.am:
|
||||
* gnome-settings-daemon/actions/Makefile.am:
|
||||
* gnome-settings-daemon/gnome-settings-xmodmap.c:
|
||||
(gnome_settings_modmap_dialog_call):
|
||||
* gnome-settings-daemon/gnome-settings-xrdb.c:
|
||||
* gnome-settings-daemon/gsd-media-keys-window.c: (action_changed),
|
||||
(gsd_media_keys_window_init):
|
||||
* gnome-settings-daemon/xrdb/Makefile.am:
|
||||
* typing-break/Makefile.am:
|
||||
* vfs-methods/themus/Makefile.am: Don't define directories in
|
||||
configure. Remove some obsolete defines, and use the standard
|
||||
installation paths. Bug #395383.
|
||||
|
||||
2007-01-31 Christian Persch <chpe@svn.gnome.org>
|
||||
|
||||
* configure.in:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods idl schemas $(TYPING_BREAK)
|
||||
SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods schemas $(TYPING_BREAK)
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
bin_PROGRAMS = gnome-about-me
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
pixmap_DATA = \
|
||||
gnome-about-me-lock.png \
|
||||
gnome-about-me-lock-open.png
|
||||
|
|
@ -23,7 +23,7 @@ desktopdir = $(datadir)/applications
|
|||
Desktop_in_files = gnome-about-me.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = gnome-about-me.glade
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -984,7 +984,7 @@ passdlg_init (PasswordDialog *pdialog, GtkWindow *parent)
|
|||
GtkAccelGroup *group;
|
||||
|
||||
/* Initialize dialog */
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-about-me.glade", "change-password", NULL);
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade", "change-password", NULL);
|
||||
pdialog->xml = dialog;
|
||||
|
||||
wpassdlg = WID ("change-password");
|
||||
|
|
|
|||
|
|
@ -730,7 +730,7 @@ about_me_setup_dialog (void)
|
|||
|
||||
me = g_new0 (GnomeAboutMe, 1);
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-about-me.glade",
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade",
|
||||
"about-me-dialog", NULL);
|
||||
|
||||
if (dialog == NULL) {
|
||||
|
|
|
|||
|
|
@ -13,18 +13,19 @@ desktopdir = $(datadir)/applications
|
|||
Desktop_in_files = at-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
pixmap_DATA = \
|
||||
at-startup.png \
|
||||
at-support.png
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = at-enable-dialog.glade
|
||||
|
||||
INCLUDES = $(AT_CAPPLET_CFLAGS) \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DPIXMAPDIR=\""$(pixmapdir)"\" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ gnome_accessibility_keyboard_properties_LDADD = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
pixmap_DATA = \
|
||||
accessibility-keyboard-togglekey.png \
|
||||
accessibility-keyboard-mousekey.png \
|
||||
|
|
@ -23,14 +23,20 @@ pixmap_DATA = \
|
|||
accessibility-keyboard-stickykey.png \
|
||||
accessibility-keyboard-bouncekey.png
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = gnome-accessibility-keyboard-properties.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
Desktop_in_files = accessibility-keyboard.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
|
||||
-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
|
||||
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA)
|
||||
|
||||
|
|
|
|||
|
|
@ -456,8 +456,7 @@ setup_accessX_dialog (GConfChangeSet *changeset)
|
|||
{
|
||||
GConfClient *client;
|
||||
char const *toplevel_name = "accessX_dialog";
|
||||
GladeXML *dialog = glade_xml_new (GNOMECC_DATA_DIR
|
||||
"/interfaces/gnome-accessibility-keyboard-properties.glade",
|
||||
GladeXML *dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-accessibility-keyboard-properties.glade",
|
||||
toplevel_name, NULL);
|
||||
GtkWidget *toplevel = WID (toplevel_name);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ WALLPAPER_DATADIR = $(datadir)/gnome-background-properties
|
|||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
|
||||
-DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\"
|
||||
|
||||
bin_PROGRAMS = gnome-background-properties
|
||||
|
|
@ -31,7 +32,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = gnome-background-properties.glade
|
||||
|
||||
install-data-local:
|
||||
|
|
|
|||
|
|
@ -797,8 +797,7 @@ static GladeXML * gnome_wp_create_dialog (void) {
|
|||
GladeXML * new;
|
||||
gchar * gladefile;
|
||||
|
||||
gladefile = g_build_filename (GNOMECC_DATA_DIR,
|
||||
"interfaces",
|
||||
gladefile = g_build_filename (GNOMECC_GLADE_DIR,
|
||||
"gnome-background-properties.glade",
|
||||
NULL);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in
|
||||
|
||||
INCLUDES = \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_ICONS_DIR="\"$(pkgdatadir)/icons\"" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
|
||||
-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
|
||||
-DG_LOG_DOMAIN=\"capplet-common\" \
|
||||
-DINSTALL_PREFIX=\"$(prefix)\" \
|
||||
-I$(top_srcdir) \
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@ capplet_set_icon (GtkWidget *window, char const *icon_file_name)
|
|||
|
||||
if (icon_pixbuf == NULL) {
|
||||
/* Then we fallback to the control center icon location */
|
||||
path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL);
|
||||
path = g_build_filename (GNOMECC_ICONS_DIR, icon_file_name, NULL);
|
||||
|
||||
icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
|
||||
g_free (path);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ gnome_default_applications_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = gnome-default-applications-properties.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
|
|
@ -16,7 +16,7 @@ Desktop_in_files = default-applications.desktop.in
|
|||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
xmldata_in_files = gnome-default-applications.xml.in
|
||||
xmldatadir = $(datadir)/gnome-default-applications
|
||||
xmldatadir = $(pkgdatadir)/gnome-default-applications
|
||||
xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
|
||||
@INTLTOOL_XML_RULE@
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ gnome_display_properties_LDFLAGS = -export-dynamic
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
iconsdir = $(pkgdatadir)/icons
|
||||
icons_DATA = display-capplet.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
|
|
@ -21,7 +21,7 @@ INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
|
|||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DPIXMAPDIR=\""$(pixmapdir)"\"
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
|
||||
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(icons_DATA)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ gnome_file_types_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = file-types-properties.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ create_dialog (void)
|
|||
GtkTreeViewColumn *column;
|
||||
GtkTreeSelection *selection;
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "main_dialog", NULL);
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/file-types-properties.glade", "main_dialog", NULL);
|
||||
|
||||
model = GTK_TREE_MODEL (mime_types_model_new (FALSE));
|
||||
treeview = WID ("mime_types_tree");
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ mime_category_edit_dialog_init (MimeCategoryEditDialog *dialog, MimeCategoryEdit
|
|||
|
||||
dialog->p = g_new0 (MimeCategoryEditDialogPrivate, 1);
|
||||
dialog->p->dialog_xml = glade_xml_new
|
||||
(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "mime_category_edit_widget", NULL);
|
||||
(GNOMECC_GLADE_DIR "/file-types-properties.glade", "mime_category_edit_widget", NULL);
|
||||
|
||||
dialog->p->model = NULL;
|
||||
dialog->p->info = NULL;
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ mime_edit_dialog_init (MimeEditDialog *dialog, MimeEditDialogClass *class)
|
|||
|
||||
dialog->p = g_new0 (MimeEditDialogPrivate, 1);
|
||||
dialog->p->dialog_xml = glade_xml_new
|
||||
(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "edit_widget", NULL);
|
||||
(GNOMECC_GLADE_DIR "/file-types-properties.glade", "edit_widget", NULL);
|
||||
|
||||
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
|
||||
gtk_size_group_add_widget (size_group, WID ("description_label"));
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ service_edit_dialog_init (ServiceEditDialog *dialog, ServiceEditDialogClass *cla
|
|||
|
||||
dialog->p = g_new0 (ServiceEditDialogPrivate, 1);
|
||||
dialog->p->dialog_xml = glade_xml_new
|
||||
(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "service_edit_widget", NULL);
|
||||
(GNOMECC_GLADE_DIR "/file-types-properties.glade", "service_edit_widget", NULL);
|
||||
|
||||
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
|
||||
gtk_size_group_add_widget (size_group, WID ("description_label"));
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ gnome_font_properties_LDFLAGS = -export-dynamic
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
pixmap_DATA = \
|
||||
subpixel-rgb.png \
|
||||
subpixel-bgr.png \
|
||||
|
|
@ -22,13 +22,14 @@ desktopdir = $(datadir)/applications
|
|||
Desktop_in_files = font-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = font-properties.glade
|
||||
|
||||
INCLUDES = $(FONT_CAPPLET_CFLAGS) \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DPIXMAPDIR=\""$(pixmapdir)"\"
|
||||
-DPIXMAPDIR=\""$(pixmapdir)"\" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)
|
||||
|
|
|
|||
|
|
@ -10,14 +10,18 @@ gnome_keybinding_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = gnome-keybinding-properties.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
Desktop_in_files = keybinding.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA)
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ create_dialog (void)
|
|||
{
|
||||
GladeXML *dialog;
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
|
||||
|
||||
return dialog;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ gnome_keyboard_properties_LDADD = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = gnome-keyboard-properties.glade
|
||||
|
||||
pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapsdir = $(pkgdatadir)/pixmaps
|
||||
pixmaps_DATA = \
|
||||
keyboard-repeat.png \
|
||||
keyboard-cursor.png \
|
||||
|
|
@ -27,6 +27,11 @@ desktopdir = $(datadir)/applications
|
|||
Desktop_in_files = keyboard.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBGNOMEKBDUI_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
$(LIBGNOMEKBDUI_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA)
|
||||
|
|
|
|||
|
|
@ -657,8 +657,8 @@ void
|
|||
xkb_layout_choose (GladeXML * dialog)
|
||||
{
|
||||
GladeXML *chooser_dialog =
|
||||
glade_xml_new (GNOMECC_DATA_DIR
|
||||
"/interfaces/gnome-keyboard-properties.glade",
|
||||
glade_xml_new (GNOMECC_GLADE_DIR
|
||||
"/gnome-keyboard-properties.glade",
|
||||
"xkb_layout_chooser", NULL);
|
||||
GtkWidget *chooser = CWID ("xkb_layout_chooser");
|
||||
GtkWidget *kbdraw = NULL;
|
||||
|
|
|
|||
|
|
@ -161,8 +161,8 @@ void
|
|||
choose_model (GladeXML * dialog)
|
||||
{
|
||||
GladeXML *chooser_dialog =
|
||||
glade_xml_new (GNOMECC_DATA_DIR
|
||||
"/interfaces/gnome-keyboard-properties.glade",
|
||||
glade_xml_new (GNOMECC_GLADE_DIR
|
||||
"/gnome-keyboard-properties.glade",
|
||||
"xkb_model_chooser", NULL);
|
||||
GtkWidget *chooser = CWID ("xkb_model_chooser");
|
||||
gtk_window_set_transient_for (GTK_WINDOW (chooser),
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ create_dialog (void)
|
|||
GladeXML *dialog;
|
||||
GtkSizeGroup *size_group;
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keyboard-properties.glade", "keyboard_dialog", NULL);
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keyboard-properties.glade", "keyboard_dialog", NULL);
|
||||
|
||||
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
|
||||
gtk_size_group_add_widget (size_group, WID ("repeat_slow_label"));
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ gnome_localization_properties_LDADD = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = gnome-localization-properties.glade
|
||||
|
||||
pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapsdir = $(pkgdatadir)/pixmaps
|
||||
pixmaps_DATA = \
|
||||
localization-capplet.png
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ create_dialog (void)
|
|||
GladeXML *dialog;
|
||||
|
||||
dialog = glade_xml_new
|
||||
(GNOMECC_DATA_DIR "/interfaces/gnome-localization-properties.glade",
|
||||
(GNOMECC_GLADE_DIR "/gnome-localization-properties.glade",
|
||||
NULL, NULL);
|
||||
|
||||
return dialog;
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ pixmap_DATA =
|
|||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
iconsdir = $(pkgdatadir)/icons
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
Glade_DATA = $(cappletname)-properties.glade
|
||||
icons_DATA = $(cappletname)-capplet.png
|
||||
desktop = $(cappletname).desktop
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ gnome_mouse_properties_SOURCES = gnome-mouse-properties.c
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
pixmap_DATA = \
|
||||
double-click-on.png \
|
||||
double-click-off.png \
|
||||
|
|
@ -24,13 +24,17 @@ cursorfont_DATA = \
|
|||
cursor-white.pcf \
|
||||
cursor-large-white.pcf
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = gnome-mouse-properties.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
Desktop_in_files = gnome-settings-mouse.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_DATA)
|
||||
|
|
|
|||
|
|
@ -982,7 +982,7 @@ create_dialog (void)
|
|||
/* register the custom type */
|
||||
(void) mouse_capplet_check_button_get_type ();
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL);
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL);
|
||||
|
||||
text = g_strdup_printf ("<b>%s</b>", _("Pointer Theme"));
|
||||
gtk_label_set_markup (GTK_LABEL (WID ("cursor_category_label")), text);
|
||||
|
|
|
|||
|
|
@ -6,13 +6,17 @@ gnome_network_preferences_LDADD = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = gnome-network-preferences.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
desktop_in_files = gnome-network-preferences.desktop.in
|
||||
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(glade_DATA)
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ cb_http_details_button_clicked (GtkWidget *button,
|
|||
return;
|
||||
}
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-network-preferences.glade",
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
|
||||
"details_dialog", NULL);
|
||||
|
||||
details_dialog = widget = WID ("details_dialog");
|
||||
|
|
@ -545,7 +545,7 @@ main (int argc, char **argv)
|
|||
gconf_client_add_dir (client, "/system/proxy",
|
||||
GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-network-preferences.glade",
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
|
||||
"network_dialog", NULL);
|
||||
|
||||
setup_dialog (dialog);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ rollback_capplet_SOURCES = \
|
|||
|
||||
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
$(desktop).in: %.desktop.in: %.desktop.in.in
|
||||
sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
|
||||
sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(pkgdatadir)/icons/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
|
||||
|
||||
install-data-local:
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)
|
||||
|
|
@ -25,9 +25,9 @@ install-data-am: install-data-local
|
|||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
iconsdir = $(pkgdatadir)/icons
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
Glade_DATA = $(cappletname).glade
|
||||
icons_DATA = $(cappletname)-capplet.png
|
||||
desktop = $(cappletname).desktop
|
||||
|
|
|
|||
|
|
@ -9,16 +9,22 @@ gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pip
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = sound-properties.glade
|
||||
|
||||
desktop_iconsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
desktop_iconsdir = $(pkgdatadir)/pixmaps
|
||||
desktop_icons_DATA = visual-bell.png
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
Desktop_in_files = gnome-settings-sound.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) $(HAL_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
$(SOUND_CAPPLET_CFLAGS) \
|
||||
$(HAL_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA)
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ create_dialog (void)
|
|||
GladeXML *dialog;
|
||||
GtkWidget *widget, *box, *view;
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/sound-properties.glade", "sound_prefs_dialog", NULL);
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/sound-properties.glade", "sound_prefs_dialog", NULL);
|
||||
widget = glade_xml_get_widget (dialog, "sound_prefs_dialog");
|
||||
|
||||
props = sound_properties_new ();
|
||||
|
|
@ -502,7 +502,7 @@ device_test_button_clicked (GtkWidget *button, gpointer user_data)
|
|||
{
|
||||
DeviceChooser *device_chooser = (DeviceChooser *) user_data;
|
||||
|
||||
GladeXML *dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/sound-properties.glade", NULL, NULL);
|
||||
GladeXML *dialog = glade_xml_new (GNOMECC_GLADE_DIR "/sound-properties.glade", NULL, NULL);
|
||||
|
||||
user_test_pipeline (dialog, GTK_WINDOW (dialog_win), device_chooser->test_pipeline);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
bin_PROGRAMS = gnome-theme-manager
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
pixmap_DATA = \
|
||||
theme-thumbnailing.png
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ Desktop_in_files = gtk-theme-selector.desktop.in \
|
|||
gnome-theme-installer.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = theme-properties.glade
|
||||
|
||||
INCLUDES = \
|
||||
|
|
@ -48,7 +48,8 @@ INCLUDES = \
|
|||
$(METACITY_CFLAGS) \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
|
||||
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xml_files)
|
||||
EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files)
|
||||
|
|
|
|||
|
|
@ -10,9 +10,13 @@ desktopdir = $(datadir)/applications
|
|||
Desktop_in_files = gnome-ui-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = gnome-ui-properties.glade
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
|
||||
INCLUDES = \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA)
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ create_dialog (void)
|
|||
{
|
||||
GladeXML *dialog;
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
|
||||
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
|
||||
return dialog;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ pixmap_DATA =
|
|||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
iconsdir = $(pkgdatadir)/icons
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
pixmapdir = $(pkgdatadir)/pixmaps
|
||||
Glade_DATA = $(cappletname)-properties.glade
|
||||
icons_DATA = $(cappletname)-capplet.png
|
||||
desktop = $(cappletname).desktop
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ gnome_window_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
gladedir = $(pkgdatadir)/glade
|
||||
glade_DATA = gnome-window-properties.glade
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ wmdata_DATA = $(desktop_files)
|
|||
EXTRA_DIST = $(desktop_in_in_files)
|
||||
|
||||
$(desktop_in_files): %.desktop.in: %.desktop.in.in
|
||||
sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
|
||||
sed s#Icon=#Icon=$(pkgdatadir)/icons/# < $< > $@
|
||||
|
||||
$(desktop_files): %.desktop: %.desktop.in
|
||||
$(top_builddir)/intltool-merge -d $(top_srcdir)/po $< $@
|
||||
|
|
|
|||
45
configure.in
45
configure.in
|
|
@ -364,20 +364,6 @@ dnl ==============================================
|
|||
dnl End: Check that we meet the dependencies
|
||||
dnl ==============================================
|
||||
|
||||
dnl ==============================================
|
||||
dnl IDL settings
|
||||
dnl ==============================================
|
||||
|
||||
# orbit-idl
|
||||
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
|
||||
AC_SUBST(ORBIT_IDL)
|
||||
|
||||
# idl directories
|
||||
LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
|
||||
AC_SUBST(LIBBONOBO_IDL_DIR)
|
||||
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
|
||||
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
|
||||
|
||||
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
|
||||
|
||||
if test x"$GDK_PIXBUF_CSOURCE" = xno; then
|
||||
|
|
@ -544,37 +530,6 @@ dnl ==============================================
|
|||
dnl End: Define the main variables
|
||||
dnl ==============================================
|
||||
|
||||
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
|
||||
AC_SUBST(ORBIT_IDL)
|
||||
|
||||
LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
|
||||
AC_SUBST(LIBBONOBO_IDL_DIR)
|
||||
|
||||
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
|
||||
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
|
||||
|
||||
|
||||
dnl ==============================================
|
||||
dnl Define the directories
|
||||
dnl ==============================================
|
||||
if test "x${prefix}" = "xNONE"; then
|
||||
real_prefix=${ac_default_prefix}
|
||||
else
|
||||
real_prefix=${prefix}
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(GNOMECC_DATA_DIR, "${real_prefix}/share/${GETTEXT_PACKAGE}",[Path to gnomecc data files])
|
||||
AC_DEFINE_UNQUOTED(PREFIX, "$prefix", [install prefix])
|
||||
GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
|
||||
AC_SUBST(GNOMECC_ICONS_DIR)
|
||||
GNOMECC_GLADE_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/interfaces'
|
||||
AC_SUBST(GNOMECC_GLADE_DIR)
|
||||
GNOMECC_PIXMAPS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/pixmaps'
|
||||
AC_SUBST(GNOMECC_PIXMAPS_DIR)
|
||||
dnl ==============================================
|
||||
dnl End: Define the directories
|
||||
dnl ==============================================
|
||||
|
||||
dnl =======================================
|
||||
dnl Variables for config_archiverConf.sh.in
|
||||
dnl =======================================
|
||||
|
|
|
|||
|
|
@ -1,10 +1,17 @@
|
|||
SUBDIRS = xrdb actions
|
||||
|
||||
INCLUDES=$(DBUS_CFLAGS) $(LIBGNOMEKBD_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \
|
||||
-DDATADIR="\"$(datadir)\"" \
|
||||
-DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
$(FB_CFLAGS)
|
||||
INCLUDES= \
|
||||
$(DBUS_CFLAGS) \
|
||||
$(LIBGNOMEKBD_CFLAGS) \
|
||||
$(GNOME_SETTINGS_DAEMON_CFLAGS) \
|
||||
$(FB_CFLAGS) \
|
||||
-I$(top_srcdir)/libbackground \
|
||||
-I$(top_srcdir) \
|
||||
-DDATADIR="\"$(datadir)\"" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
||||
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
|
||||
-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
|
||||
|
||||
libexec_PROGRAMS=gnome-settings-daemon
|
||||
|
||||
|
|
@ -92,7 +99,7 @@ BUILT_SOURCES=gnome-settings-server.h \
|
|||
|
||||
gnome_settings_daemon_SOURCES+=$(BUILT_SOURCES)
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = modmap-dialog.glade
|
||||
|
||||
Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ endif # HAVE_OSS
|
|||
endif # HAVE_ALSA
|
||||
endif # HAVE_GSTREAMER
|
||||
|
||||
Datadir = $(datadir)/control-center-2.0/interfaces/
|
||||
Datadir = $(pkgdatadir)/glade
|
||||
Data_DATA = acme.glade
|
||||
|
||||
pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmapsdir = $(pkgdatadir)/pixmaps
|
||||
pixmaps_DATA = acme-eject.png
|
||||
|
||||
EXTRA_DIST = \
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ gnome_settings_modmap_dialog_call (void)
|
|||
homeDir = g_dir_open (g_get_home_dir (), 0, NULL);
|
||||
if (homeDir == NULL)
|
||||
return;
|
||||
xml = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/modmap-dialog.glade", "dialog1", NULL);
|
||||
xml = glade_xml_new (GNOMECC_GLADE_DIR "/modmap-dialog.glade", "dialog1", NULL);
|
||||
|
||||
if (! xml) {
|
||||
g_warning ("Could not find GLADE_FILE \n");
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
/* gnome-settings-xrdb.c
|
||||
*
|
||||
* Copyright © 2003 Ross Burton
|
||||
* Copyright © 2003 Ross Burton
|
||||
*
|
||||
* Written by Ross Burton <ross@burtonini.com>
|
||||
*
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
#include "gnome-settings-daemon.h"
|
||||
#include "gnome-settings-xrdb.h"
|
||||
|
||||
#define SYSTEM_AD_DIR DATADIR "/control-center-2.0/xrdb"
|
||||
#define SYSTEM_AD_DIR GNOMECC_DATA_DIR "/xrdb"
|
||||
#define GENERAL_AD SYSTEM_AD_DIR "/General.ad"
|
||||
#define USER_AD_DIR ".gnome2/xrdb"
|
||||
#define USER_X_RESOURCES ".Xresources"
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ action_changed (GsdMediaKeysWindow *window)
|
|||
break;
|
||||
case GSD_MEDIA_KEYS_WINDOW_ACTION_EJECT:
|
||||
volume_controls_set_visible (window, FALSE);
|
||||
window_set_icon_file (window, PIXMAPSDIR "/acme-eject.png");
|
||||
window_set_icon_file (window, GNOMECC_PIXMAPS_DIR "/acme-eject.png");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
@ -611,7 +611,7 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
|
|||
} else {
|
||||
GtkWidget *vbox;
|
||||
|
||||
window->priv->xml = glade_xml_new (DATADIR "/control-center-2.0/interfaces/acme.glade", "acme_vbox", NULL);
|
||||
window->priv->xml = glade_xml_new (GNOMECC_GLADE_DIR "/acme.glade", "acme_vbox", NULL);
|
||||
|
||||
vbox = glade_xml_get_widget (window->priv->xml, "acme_vbox");
|
||||
if (vbox != NULL) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
xrdbdir = $(datadir)/control-center-2.0/xrdb
|
||||
xrdbdir = $(pkgdatadir)/xrdb
|
||||
xrdb_DATA = \
|
||||
General.ad \
|
||||
Editres.ad \
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ gnome_typing_monitor_SOURCES = \
|
|||
|
||||
gnome_typing_monitor_CPPFLAGS = \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\" \
|
||||
-DIMAGEDIR=\"$(pkgdatadir)/pixmaps\" \
|
||||
$(AM_CPPFLAGS)
|
||||
gnome_typing_monitor_CFLAGS = \
|
||||
@GNOME_CFLAGS@ \
|
||||
|
|
@ -24,7 +24,7 @@ gnome_typing_monitor_CFLAGS = \
|
|||
gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@
|
||||
gnome_typing_monitor_LDFLAGS = -export-dynamic
|
||||
|
||||
imagedir = $(GNOMECC_PIXMAPS_DIR)
|
||||
imagedir = $(pkgdatadir)/pixmaps
|
||||
image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png
|
||||
|
||||
# Themeable application icon
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \
|
|||
$(THEMUS_COMPONENT_CFLAGS) \
|
||||
$(THEMUS_APPLIER_CFLAGS) \
|
||||
-I$(top_srcdir)/capplets/common \
|
||||
-DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \
|
||||
-DGNOMECC_GLADE_DIR=\"$(pkgdatadir)/glade\" \
|
||||
-DDIRECTORY_DIR=\"$(directorydir)\" \
|
||||
-DDATA_DIR=\"$(datadir)/themus\" \
|
||||
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
|
||||
|
|
@ -41,7 +41,7 @@ libnautilus_themus_la_SOURCES = \
|
|||
themus-properties-view.h \
|
||||
themus-properties-main.c
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Gladedir = $(pkgdatadir)/glade
|
||||
Glade_DATA = apply-font.glade
|
||||
|
||||
@INTLTOOL_DIRECTORY_RULE@
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue