diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-08-31 22:25:56 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-08-31 22:25:56 +0000 |
| commit | 8013e200f20e7c328ffa4239973b9d9b8943e59c (patch) | |
| tree | 99213a6b55b0bfbde17dd4678bfa10912cf3a1fa | |
| parent | 33cc4b3cd1959fa4fbb348aad4f7150ed7b25140 (diff) | |
| download | ATCD-8013e200f20e7c328ffa4239973b9d9b8943e59c.tar.gz | |
ChangeLogTag:Thu Aug 31 15:31:30 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | include/makeinclude/outputdir.bor | 4 |
4 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 522d6dfbad7..49778993a90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ Thu Aug 31 15:31:30 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * include/makeinclude/outputdir.bor: Fixed a typo with the - OBJDIR macro when the -DPASCAL option is used. Thanks to Marcel - Van Der Weert <mvdweert@aweta.nl> for reporting this. + * include/makeinclude/outputdir.bor: Added a comment to explain + how the OBJDIR macro works when the -DPASCAL option is used. + Thanks to Marcel Van Der Weert <mvdweert@aweta.nl> and + Christopher Kohlhoff <chris@kohlhoff.com> for reporting this. Thu Aug 31 08:32:11 2000 Albert Wijnja <Albert.Wijnja@meco.nl> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 522d6dfbad7..49778993a90 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,8 +1,9 @@ Thu Aug 31 15:31:30 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * include/makeinclude/outputdir.bor: Fixed a typo with the - OBJDIR macro when the -DPASCAL option is used. Thanks to Marcel - Van Der Weert <mvdweert@aweta.nl> for reporting this. + * include/makeinclude/outputdir.bor: Added a comment to explain + how the OBJDIR macro works when the -DPASCAL option is used. + Thanks to Marcel Van Der Weert <mvdweert@aweta.nl> and + Christopher Kohlhoff <chris@kohlhoff.com> for reporting this. Thu Aug 31 08:32:11 2000 Albert Wijnja <Albert.Wijnja@meco.nl> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 522d6dfbad7..49778993a90 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,8 +1,9 @@ Thu Aug 31 15:31:30 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * include/makeinclude/outputdir.bor: Fixed a typo with the - OBJDIR macro when the -DPASCAL option is used. Thanks to Marcel - Van Der Weert <mvdweert@aweta.nl> for reporting this. + * include/makeinclude/outputdir.bor: Added a comment to explain + how the OBJDIR macro works when the -DPASCAL option is used. + Thanks to Marcel Van Der Weert <mvdweert@aweta.nl> and + Christopher Kohlhoff <chris@kohlhoff.com> for reporting this. Thu Aug 31 08:32:11 2000 Albert Wijnja <Albert.Wijnja@meco.nl> diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor index 026dada72d0..705c433d43e 100644 --- a/include/makeinclude/outputdir.bor +++ b/include/makeinclude/outputdir.bor @@ -58,8 +58,10 @@ MAKE_BINDIR=$(MKDIR) "$(BINDIR)" MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)" !endif +# PASCAL/non-PASCAL build configurations use the same object directory +# since their compiler options are identical. !ifndef OBJDIR -OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR) +OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR) !endif !ifdef MKDIR |