summaryrefslogtreecommitdiff
path: root/build/jlibtool.c
diff options
context:
space:
mode:
authorjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2006-07-14 18:19:52 +0000
committerjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2006-07-14 18:19:52 +0000
commitbbbc0925eac28e92412e823505a221ae19af5cc0 (patch)
tree453a219fb926432ae11469f321cb97b5cfdb2dca /build/jlibtool.c
parent39b997a69fc454c40a08de6153eba9b5f8d00495 (diff)
downloadlibapr-bbbc0925eac28e92412e823505a221ae19af5cc0.tar.gz
Teach jlibtool how to deal with .exe's on MinGW.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@421977 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/jlibtool.c')
-rw-r--r--build/jlibtool.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/build/jlibtool.c b/build/jlibtool.c
index 0d577a459..b3ca79cae 100644
--- a/build/jlibtool.c
+++ b/build/jlibtool.c
@@ -160,6 +160,7 @@
# define SHARED_OPTS "-shared"
# define MODULE_OPTS "-shared"
# define MKDIR_NO_UMASK
+# define EXE_EXT ".exe"
#endif
#ifndef SHELL_CMD
@@ -1230,7 +1231,11 @@ int parse_output_file_name(char *arg, command_t *cmd_data)
}
}
+#ifdef EXE_EXT
+ if (!ext || strcmp(ext, EXE_EXT) == 0) {
+#else
if (!ext) {
+#endif
cmd_data->basename = arg;
cmd_data->output = otProgram;
#if defined(_OSD_POSIX)
@@ -1239,7 +1244,9 @@ int parse_output_file_name(char *arg, command_t *cmd_data)
newarg = (char *)malloc(strlen(arg) + 5);
strcpy(newarg, arg);
#ifdef EXE_EXT
+ if (!ext) {
strcat(newarg, EXE_EXT);
+ }
#endif
cmd_data->output_name = newarg;
return 1;