diff options
| author | jacob berkman <jacob@ximian.com> | 2002-09-26 16:49:42 +0000 |
|---|---|---|
| committer | Jacob Berkman <jberkman@src.gnome.org> | 2002-09-26 16:49:42 +0000 |
| commit | b67a5e0c2512f38420759a05d3d6cc67e15c638e (patch) | |
| tree | 176e326627db55dfa8d54855c63fdb7aa5f25511 /control-center/Makefile.am | |
| parent | 65cd6f3d57eed35faaacd35eeeb031be2da170f5 (diff) | |
| download | gnome-control-center-b67a5e0c2512f38420759a05d3d6cc67e15c638e.tar.gz | |
fix the macro
2002-09-26 jacob berkman <jacob@ximian.com>
* capplet-dir.c (find_icon): fix the macro
* capplet-dir-view.c (capplet_dir_view_init): use control-center2.png
* Makefile.am: remove control-center.png which conflicts with the
gnome 1 package and define different macros for $datadir/pixmaps
and $gnomecc_icon_dir
Diffstat (limited to 'control-center/Makefile.am')
| -rw-r--r-- | control-center/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/control-center/Makefile.am b/control-center/Makefile.am index c39d4da64..183ad9477 100644 --- a/control-center/Makefile.am +++ b/control-center/Makefile.am @@ -1,6 +1,3 @@ -appicondir = $(GNOMECC_ICONS_DIR) -appicon_DATA = control-center.png - splashdir = $(datadir)/pixmaps/gnomecc-2 splash_DATA = \ bcg_top.png \ @@ -19,7 +16,8 @@ ui_DATA = gnomecc-ui.xml INCLUDES = \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\" \ - -DPIXMAPS_DIR=\""$(appicondir)"\" \ + -DGNOMECC_ICONS_DIR=\""$(GNOMECC_ICONS_DIR)"\" \ + -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \ -DART_DIR=\""$(splashdir)"\" \ -DGNOME_SBINDIR=\""$(sbindir)"\" \ $(GNOMECC_CFLAGS) |