dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use g_find_program_in_path(). 

2003-07-27  Tor Lillqvist  <tml@iki.fi>

	* gimptool-win32.c.in (get_prefix): Use g_find_program_in_path().

	* configure.in: Expand gimptool-win32.c.

	* Makefile.am: Distribute gimptool-win32.c.in.
This commit is contained in:
Tor Lillqvist 2003-07-27 22:52:25 +00:00 committed by Tor Lillqvist
parent 9b117a6de7
commit 761f6834f7
4 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2003-07-27 Tor Lillqvist <tml@iki.fi>
* gimptool-win32.c.in (get_prefix): Use g_find_program_in_path().
* configure.in: Expand gimptool-win32.c.
* Makefile.am: Distribute gimptool-win32.c.in.
* plug-ins/*/Makefile.am: Use -mwindows on Win32.
2003-07-27 Henrik Brix Andersen <brix@gimp.org>

1
Makefile.am
View File

@ -47,6 +47,7 @@ EXTRA_DIST = \
README.i18n \
README.win32 \
TODO.xml \
gimptool-win32.c.in \
config.h.win32 \
intltool-extract.in \
intltool-merge.in \

1
configure.in
View File

@ -1151,6 +1151,7 @@ AC_SUBST(GIMP_PLUGINS)
AC_SUBST(GIMP_MODULES)
AC_OUTPUT([
gimptool-win32.c
tools/Makefile
tools/authorsgen/Makefile
tools/pdbgen/Makefile

55
gimptool-win32.c.in
View File

@ -131,50 +131,37 @@ get_prefix (gchar slash)
* installation-time prefix from where gimp.exe can be found.
*/
char *path;
char *p;
char *q, *r;
gchar *path;
char *p, *q, *r;
struct stat st;
if (prefix != NULL)
return prefix;
path = g_find_program_in_path ("gimp-1.3.exe");
p = path = g_strdup (g_getenv ("PATH"));
while ((q = strchr (p, G_SEARCHPATH_SEPARATOR)) != NULL)
if (path == NULL)
path = g_find_program_in_path ("gimp.exe");
r = strrchr (path, G_DIR_SEPARATOR);
if (r != NULL)
{
gchar *test;
*q = '\0';
test = g_strconcat (p, G_DIR_SEPARATOR_S, "gimp", EXEEXT, NULL);
if (stat (test, &st) == 0 &&
IS_EXECUTABLE (st.st_mode))
*r = '\0';
if (strlen (path) >= 4 &&
g_strcasecmp (r - 4, G_DIR_SEPARATOR_S "bin") == 0)
{
r = strrchr (test, G_DIR_SEPARATOR);
if (r != NULL)
{
*r = '\0';
if (strlen (test) >= 4 &&
g_strcasecmp (r - 4, G_DIR_SEPARATOR_S "bin") == 0)
{
r[-4] = '\0';
prefix = test;
r[-4] = '\0';
prefix = path;
#ifdef G_OS_WIN32
if (slash == '/')
{
/* Use forward slashes, less quoting trouble in Makefiles */
while ((p = strchr (prefix, '\\')) != NULL)
*p = '/';
}
#endif
return prefix;
}
if (slash == '/')
{
/* Use forward slashes, less quoting trouble in Makefiles */
while ((p = strchr (prefix, '\\')) != NULL)
*p = '/';
}
#endif
return prefix;
}
p = q + 1;
}
fprintf (stderr, "Cannot find any suitable GIMP executable in PATH\n");
fprintf (stderr, "Cannot determine GIMP @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@ installation location\n");
exit (1);
#else
return "@prefix@";