diff --git a/ChangeLog b/ChangeLog index ffe1a5d3..fefd2850 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-09-09 Paul Smith + * default.c (default_variables): Use a correct default LIBPPATERNS + for MacOS. Fixes Savannah bug #37197. + * read.c (record_files): Reset the default macro values if .POSIX is set. Fixes Savannah bug #37069. (parse_file_seq): Break out of an infinite loop if we're not diff --git a/default.c b/default.c index 9747b335..27718099 100644 --- a/default.c +++ b/default.c @@ -514,15 +514,15 @@ static const char *default_variables[] = "SCCS_OUTPUT_OPTION", "-G$@", #endif -#ifdef _AMIGA +#if defined(_AMIGA) ".LIBPATTERNS", "%.lib", -#else -#ifdef __MSDOS__ +#elif defined(__MSDOS__) ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", +#elif defined(__APPLE__) + ".LIBPATTERNS", "lib%.dylib lib%.a", #else ".LIBPATTERNS", "lib%.so lib%.a", #endif -#endif #endif /* !VMS */ 0, 0