diff options
| author | Paul Smith <psmith@gnu.org> | 2023-01-16 00:03:13 -0500 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2023-01-16 00:03:13 -0500 |
| commit | 6f3e9e9b844cf5e9cd95e9af9ae5fa9409993bd7 (patch) | |
| tree | acec441002f46aef18ea420dee099ca25e7dc665 /src/default.c | |
| parent | 6128c3e266940ebc3c5e5a4a54241354334d1ebc (diff) | |
| download | make-git-6f3e9e9b844cf5e9cd95e9af9ae5fa9409993bd7.tar.gz | |
Use MK_OS_DOS macro instead of __MSDOS__
* src/configh.dos: Set MK_OS_DOS to 1
* src/*: Convert #if refs to __MSDOS__, to use MK_OS_DOS.
* gl/lib/*: Ditto.
Diffstat (limited to 'src/default.c')
| -rw-r--r-- | src/default.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/default.c b/src/default.c index c0972f23..f5cfe8a2 100644 --- a/src/default.c +++ b/src/default.c @@ -27,7 +27,7 @@ this program. If not, see <https://www.gnu.org/licenses/>. */ /* Define GCC_IS_NATIVE if gcc is the native development environment on your system (gcc/bison/flex vs cc/yacc/lex). */ -#if defined(__MSDOS__) || defined(__EMX__) +#if MK_OS_DOS || defined(__EMX__) # define GCC_IS_NATIVE #endif @@ -326,19 +326,19 @@ static const char *default_suffix_rules[] = ".c.ln", "$(LINT.c) -C$* $<", ".y.ln", -#ifndef __MSDOS__ - "$(YACC.y) $< \n $(LINT.c) -C$* y.tab.c \n $(RM) y.tab.c", -#else +#if MK_OS_DOS "$(YACC.y) $< \n $(LINT.c) -C$* y_tab.c \n $(RM) y_tab.c", +#else + "$(YACC.y) $< \n $(LINT.c) -C$* y.tab.c \n $(RM) y.tab.c", #endif ".l.ln", "@$(RM) $*.c\n $(LEX.l) $< > $*.c\n$(LINT.c) -i $*.c -o $@\n $(RM) $*.c", ".y.c", -#ifndef __MSDOS__ - "$(YACC.y) $< \n mv -f y.tab.c $@", -#else +#if MK_OS_DOS "$(YACC.y) $< \n mv -f y_tab.c $@", +#else + "$(YACC.y) $< \n mv -f y.tab.c $@", #endif ".l.c", "@$(RM) $@ \n $(LEX.l) $< > $@", @@ -536,7 +536,7 @@ static const char *default_variables[] = "CXX", MAKE_CXX, #else # ifdef GCC_IS_NATIVE -# ifdef __MSDOS__ +# ifdef MK_OS_DOS "CXX", "gpp", /* g++ is an invalid name on MSDOS */ # else "CXX", "gcc", @@ -660,7 +660,7 @@ static const char *default_variables[] = "SCCS_OUTPUT_OPTION", "-G$@", #endif -#if defined(__MSDOS__) +#if MK_OS_DOS ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", #elif defined(__APPLE__) ".LIBPATTERNS", "lib%.dylib lib%.a", |