Commit 9a1a607b authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

new directories etc/, data/images/ and data/misc/.

2001-11-14  Michael Natterer  <mitch@gimp.org>

	* configure.in: new directories etc/, data/images/ and data/misc/.

	* Makefile.am
	* data/Makefile.am: added new SUBDIRs.

	* data/images/Makefile.am
	* data/misc/Makefile.am
	* etc/Makefile.am: new Makefiles

	* gimp1_0_splash.ppm
	* gimp1_2_splash.ppm
	* gimp_logo.ppm
	* gimp_splash.ppm: removed, now in data/images/

	* rmshm
	* user_install
	* user_install.bat: removed, now in data/misc/

	* gimprc.in
	* gimprc.win32
	* gimprc_user.in
	* gtkrc_user
	* ps-menurc
	* unitrc: removed, now in etc/

	* app/gui/about-dialog.c
	* app/gui/splash.c
	* app/gui/user-install-dialog.c: changed image and script file
	paths accordingly.
parent 38a1e542
......@@ -7,11 +7,9 @@ config.cache
stamp-h
stamp-h1
gimp.spec
gimprc
config.status
libtool
aclocal.m4
gimprc_user
gimptool-1.4
intl
config.h.in
......
2001-11-14 Michael Natterer <mitch@gimp.org>
* configure.in: new directories etc/, data/images/ and data/misc/.
* Makefile.am
* data/Makefile.am: added new SUBDIRs.
* data/images/Makefile.am
* data/misc/Makefile.am
* etc/Makefile.am: new Makefiles
* gimp1_0_splash.ppm
* gimp1_2_splash.ppm
* gimp_logo.ppm
* gimp_splash.ppm: removed, now in data/images/
* rmshm
* user_install
* user_install.bat: removed, now in data/misc/
* gimprc.in
* gimprc.win32
* gimprc_user.in
* gtkrc_user
* ps-menurc
* unitrc: removed, now in etc/
* app/gui/about-dialog.c
* app/gui/splash.c
* app/gui/user-install-dialog.c: changed image and script file
paths accordingly.
2001-11-14 Sven Neumann <sven@gimp.org>
* app/pdb/gimprc_cmds.c
......
......@@ -21,6 +21,7 @@ SUBDIRS = \
$(GIMP_MODULES) \
$(GIMP_PLUGINS) \
data \
etc \
tips \
docs \
devel-docs \
......@@ -39,15 +40,7 @@ EXTRA_DIST = \
PLUGIN_MAINTAINERS \
MAINTAINERS \
TODO \
gtkrc_user \
unitrc \
gimp_logo.ppm \
gimp_splash.ppm \
rmshm \
user_install \
user_install.bat \
ps-menurc \
gimprc.win32 \
TODO.xml \
config.h.win32 \
po/po2tbl.sed.in \
po/update.sh \
......@@ -57,21 +50,6 @@ EXTRA_DIST = \
po-script-fu/script-fu-xgettext \
po-script-fu/update.sh
gimpdata_DATA = \
gimp_logo.ppm \
gimp_splash.ppm
gimpsysconf_DATA = \
gimprc \
gimprc_user \
gtkrc_user \
unitrc \
ps-menurc
gimpdata_SCRIPTS = user_install
scriptdata =
gimpinstall:
$(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall
......
......@@ -316,7 +316,8 @@ about_dialog_load_logo (GtkWidget *window)
if (logo_pixmap)
return TRUE;
filename = g_build_filename (gimp_data_directory (), "gimp_logo.ppm", NULL);
filename = g_build_filename (gimp_data_directory (), "images",
"gimp_logo.ppm", NULL);
fp = fopen (filename, "rb");
g_free (filename);
......
......@@ -923,7 +923,8 @@ user_install_run (void)
gint err;
gboolean executable = TRUE;
filename = g_build_filename (gimp_data_directory (), USER_INSTALL, NULL);
filename = g_build_filename (gimp_data_directory (), "misc",
USER_INSTALL, NULL);
if ((err = stat (filename, &stat_buf)) != 0)
{
......@@ -973,7 +974,8 @@ user_install_run (void)
g_free (filename);
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
filename = g_build_filename (quoted_data_dir, "misc",
USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s",
filename,
......
......@@ -316,7 +316,8 @@ about_dialog_load_logo (GtkWidget *window)
if (logo_pixmap)
return TRUE;
filename = g_build_filename (gimp_data_directory (), "gimp_logo.ppm", NULL);
filename = g_build_filename (gimp_data_directory (), "images",
"gimp_logo.ppm", NULL);
fp = fopen (filename, "rb");
g_free (filename);
......
......@@ -218,7 +218,8 @@ splash_logo_load_size (GtkWidget *window)
if (logo_pixmap)
return TRUE;
filename = g_build_filename (gimp_data_directory (), "gimp_splash.ppm", NULL);
filename = g_build_filename (gimp_data_directory (), "images",
"gimp_splash.ppm", NULL);
fp = fopen (filename, "rb");
......@@ -258,7 +259,8 @@ splash_logo_load (void)
if (! win_initstatus || logo_pixmap || ! splash_show_logo)
return;
filename = g_build_filename (gimp_data_directory (), "gimp_splash.ppm", NULL);
filename = g_build_filename (gimp_data_directory (), "images",
"gimp_splash.ppm", NULL);
fp = fopen (filename, "rb");
......
......@@ -923,7 +923,8 @@ user_install_run (void)
gint err;
gboolean executable = TRUE;
filename = g_build_filename (gimp_data_directory (), USER_INSTALL, NULL);
filename = g_build_filename (gimp_data_directory (), "misc",
USER_INSTALL, NULL);
if ((err = stat (filename, &stat_buf)) != 0)
{
......@@ -973,7 +974,8 @@ user_install_run (void)
g_free (filename);
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
filename = g_build_filename (quoted_data_dir, "misc",
USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s",
filename,
......
......@@ -825,8 +825,6 @@ AC_SUBST(GIMP_MODULES)
dnl Output the Makefiles
AC_OUTPUT([
gimprc
gimprc_user
gimptool-1.4
gimp.spec
Makefile
......@@ -925,10 +923,15 @@ themes/Default/Makefile
themes/Default/images/Makefile
themes/Default/images/tools/Makefile
data/Makefile
data/misc/Makefile
data/images/Makefile
data/brushes/Makefile
data/gradients/Makefile
data/palettes/Makefile
data/patterns/Makefile
etc/Makefile
etc/gimprc
etc/gimprc_user
m4macros/Makefile
po/Makefile.in
po-libgimp/Makefile.in
......
## Makefile.am for gimp/data
SUBDIRS = brushes gradients palettes patterns
SUBDIRS = misc images brushes gradients palettes patterns
EXTRA_DIST = AUTHORS ChangeLog README
EXTRA_DIST = \
AUTHORS \
ChangeLog \
README
Makefile.in
Makefile
## Makefile.am for gimp/data/images
imagedatadir = $(gimpdatadir)/images
imagedata_DATA = \
gimp_logo.ppm \
gimp_splash.ppm
EXTRA_DIST = $(imagedata_DATA)
Makefile.in
Makefile
## Makefile.am for gimp/data/misc
miscdatadir = $(gimpdatadir)/misc
miscdata_SCRIPTS = \
user_install
EXTRA_DIST =
$(miscdata_SCRIPTS) \
user_install.bat \
rmshm
Makefile
Makefile.in
gimprc
gimprc_user
## Makefile.am for gimp/etc
gimpsysconf_DATA = \
gimprc \
gimprc_user \
gtkrc_user \
unitrc \
ps-menurc
EXTRA_DIST = \
gimprc.in \
gimprc_user.in \
gimprc.win32 \
gtkrc_user \
unitrc \
ps-menurc
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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