summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2000-01-27 00:00:27 +0000
committerPaul Smith <psmith@gnu.org>2000-01-27 00:00:27 +0000
commit95a09e94f7b4155913cb4b1a0e6c1576780f09d1 (patch)
treef530821fc1bd9070020d61ca71e3e2bc66ab1912
parentde2a8fc730d0b87cd19959ba876ffa34d0853dcd (diff)
downloadgunmake-95a09e94f7b4155913cb4b1a0e6c1576780f09d1.tar.gz
* Some pre-pretest release cleanup.
-rw-r--r--Makefile.am2
-rw-r--r--configure.in1
-rw-r--r--gettext.c23
-rw-r--r--i18n/Makefile.am10
-rw-r--r--tests/scripts/features/double_colon16
5 files changed, 31 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index e70c237..0ed497c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ SRCS = ar.c arscan.c commands.c dir.c expand.c file.c function.c \
rule.c signame.c variable.c vpath.c
make_SOURCES = $(SRCS) default.c remote-$(REMOTE).c version.c \
- getopt.c getopt1.c
+ getopt1.c
noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \
debug.h signame.h getopt.h gettext.h
diff --git a/configure.in b/configure.in
index ba54f12..d7bd71b 100644
--- a/configure.in
+++ b/configure.in
@@ -36,6 +36,7 @@ AC_CHECK_HEADERS(stdlib.h unistd.h limits.h sys/param.h fcntl.h string.h \
AC_PROG_CC_C_O
AM_PROG_CC_STDC
AC_C_CONST dnl getopt needs this.
+AC_C_INLINE dnl gettext needs this.
AC_HEADER_STAT
AC_STRUCT_ST_MTIM_NSEC
diff --git a/gettext.c b/gettext.c
index 4540b1b..b35b18d 100644
--- a/gettext.c
+++ b/gettext.c
@@ -56,6 +56,15 @@ char *alloca ();
# endif
#endif
+#if defined STDC_HEADERS || defined _LIBC
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+# else
+void free ();
+# endif
+#endif
+
#if defined _LIBC || defined HAVE_ARGZ_H
# include <argz.h>
#endif
@@ -64,6 +73,10 @@ char *alloca ();
#if defined STDC_HEADERS || defined _LIBC
# include <stdlib.h>
+#else
+# ifdef HAVE_MEMORY_H
+# include <memory.h>
+# endif
#endif
/* Interrupt of l10nflist.c */
@@ -248,7 +261,7 @@ pop (x)
return x;
}
-struct loaded_l10nfile *
+static struct loaded_l10nfile *
_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
territory, codeset, normalized_codeset, modifier, special,
sponsor, revision, filename, do_allocate)
@@ -2207,10 +2220,10 @@ void free ();
#endif
/* Contains the default location of the message catalogs. */
-static const char _nl_default_dirname[];
+/* static const char _nl_default_dirname[]; */
/* List with bindings of specific domains. */
-static struct binding *_nl_domain_bindings;
+/* static struct binding *_nl_domain_bindings; */
/* Names for the libintl functions are a problem. They must not clash
with existing names and they should follow ANSI C. But this source
@@ -2473,10 +2486,10 @@ GETTEXT (msgid)
#endif
/* Name of the default text domain. */
-static const char _nl_default_default_domain[];
+/* static const char _nl_default_default_domain[]; */
/* Default text domain in which entries for gettext(3) are to be found. */
-static const char *_nl_current_default_domain;
+/* static const char *_nl_current_default_domain; */
/* Names for the libintl functions are a problem. They must not clash
with existing names and they should follow ANSI C. But this source
diff --git a/i18n/Makefile.am b/i18n/Makefile.am
index b6a224d..409c380 100644
--- a/i18n/Makefile.am
+++ b/i18n/Makefile.am
@@ -32,10 +32,10 @@ if USE_NLS
files='$(MOFILES)'; \
for file in $$files; do \
base=`basename $$file`; \
- langdir=$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \
+ langdir=$(DESTDIR)$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \
$(mkinstalldirs) $$langdir; \
- echo " $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$$langdir/$(PACKAGE).mo"; \
- $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$$langdir/$(PACKAGE).mo; \
+ echo " $(INSTALL_DATA) $(srcdir)/$$file $$langdir/$(PACKAGE).mo"; \
+ $(INSTALL_DATA) $(srcdir)/$$file $$langdir/$(PACKAGE).mo; \
done
endif
@@ -44,8 +44,8 @@ if USE_NLS
files='$(MOFILES)'; \
for file in $$files; do \
base=`basename $$file`; \
- langdir=$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \
- rm -f $(DESTDIR)$$langdir/$(PACKAGE).mo; \
+ langdir=$(DESTDIR)$(localedir)/`echo $$base | sed 's/\.mo$$//'`/LC_MESSAGES; \
+ rm -f $$langdir/$(PACKAGE).mo; \
done
endif
diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon
index b94fc57..75060c5 100644
--- a/tests/scripts/features/double_colon
+++ b/tests/scripts/features/double_colon
@@ -96,17 +96,13 @@ $answer = "f2.h\nfoo SECOND\n";
&compare_output($answer, &get_logfile(1));
# TEST 8: I don't grok why this is different than the above, but it is...
-
-&run_make_with_options($makefile, "-j10 biz", &get_logfile, 0);
-$answer = "aaa\ntwo\nbbb\n";
-&compare_output($answer, &get_logfile(1));
+#
+# Hmm... further testing indicates this might be timing-dependent?
+#
+#&run_make_with_options($makefile, "-j10 biz", &get_logfile, 0);
+#$answer = "aaa\ntwo\nbbb\n";
+#&compare_output($answer, &get_logfile(1));
unlink('foo','f1.h','f2.h');
1;
-
-
-
-
-
-