Commit 5dc421cd authored by Rodrigo Moya's avatar Rodrigo Moya Committed by Rodrigo Moya

Fixes #150470

2004-08-18  Rodrigo Moya <rodrigo@gnome-db.org>

	Fixes #150470

	* configure.in: no need to AC_SUBST(pixmapsdir) here. Removed help/
	directory from the build until it's ready.

	* pixmaps/Makefile.am: install gnome-nettool.png and define
	pixmapsdir here.

	* src/Makefile.am: pass -DPIXMAPS_DIR to compiler.

	* src/callbacks.c (on_about_activate): s/GNOME_ICONDIR/PIXMAPS_DIR.
parent 0fec6ebf
2004-08-18 Rodrigo Moya <rodrigo@gnome-db.org>
Fixes #150470
* configure.in: no need to AC_SUBST(pixmapsdir) here. Removed help/
directory from the build until it's ready.
* pixmaps/Makefile.am: install gnome-nettool.png and define
pixmapsdir here.
* src/Makefile.am: pass -DPIXMAPS_DIR to compiler.
* src/callbacks.c (on_about_activate): s/GNOME_ICONDIR/PIXMAPS_DIR.
2004-08-18 Rodrigo Moya <rodrigo@gnome-db.org>
* help/C/*:
......
......@@ -67,22 +67,6 @@ AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${ac_default_prefix}/share/pixmaps", [Gnome pixmap directory])
else
AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [Gnome pixmap directory])
fi
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
else
AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
fi
AC_SUBST(pixmapsdir)
dnl
dnl Debugging flags
dnl
......@@ -102,7 +86,5 @@ fi
AC_OUTPUT([
Makefile
po/Makefile.in
help/Makefile
help/C/Makefile
pixmaps/Makefile
src/Makefile])
pixmaps_DATA = 16_ethernet.xpm \
16_loopback.xpm \
16_plip.xpm \
16_ppp.xpm \
irda-16.png \
network.png \
wavelan-16.png
pixmapsdir = $(datadir)/gnome-nettool/pixmaps
pixmaps_DATA = \
16_ethernet.xpm \
16_loopback.xpm \
16_plip.xpm \
16_ppp.xpm \
gnome-nettool.png \
irda-16.png \
network.png \
wavelan-16.png
icondir = $(datadir)/pixmaps
icon_DATA = gnome-nettool.png
......
dialogdir = $(datadir)/$(PACKAGE)/dialogs
dialog_DATA = gnome-nettool.glade
INCLUDES = \
-DGNOME_NETTOOL_LOCALEDIR=\""$(datadir)/locale"\" \
-DDATADIR=\""$(dialogdir)/"\" \
INCLUDES = \
-DGNOME_NETTOOL_LOCALEDIR=\""$(datadir)/locale"\" \
-DDATADIR=\""$(dialogdir)/"\" \
-DPIXMAPS_DIR=\""$(datadir)/gnome-nettool/pixmaps"\" \
@NETTOOL_CFLAGS@
LDADD = \
......
......@@ -335,7 +335,7 @@ on_about_activate (GtkWidget *menu_item, gpointer data)
{
gchar *filename = NULL;
filename = g_build_filename (GNOME_ICONDIR, "gnome-nettool.png", NULL);
filename = g_build_filename (PIXMAPS_DIR, "gnome-nettool.png", NULL);
if (filename != NULL) {
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment