diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-07 15:58:49 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-07 15:58:49 +0000 |
| commit | 2aedd7bbca58f61292da1bb2fb01cb396fd61352 (patch) | |
| tree | dbb154490f50ff52a4a4515c5184923a9890953a | |
| parent | e93d801f1a39eb2058220a3a4f38668432da09aa (diff) | |
| download | ATCD-2aedd7bbca58f61292da1bb2fb01cb396fd61352.tar.gz | |
ChangeLog tag: Fri Mar 7 09:58:06 2003 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | apps/mkcsregdb/Makefile | 2 | ||||
| -rw-r--r-- | apps/mkcsregdb/mkcsregdb.cpp | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 5197745725f..279044ee48e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 7 09:58:06 2003 Phil Mesnier <mesnier_p@ociweb.com> + + * apps/mkcsregdb/Makefile: Fixed the install location so the + make succeeds. + Fri Mar 7 08:51:56 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/Driver.pm: @@ -59,9 +64,8 @@ Thu Mar 6 11:41:46 2003 Chad Elliott <elliott_c@ociweb.com> Thu Mar 6 10:56:09 2003 Phil Mesnier <mesnier_p@ociweb.com> - * ace/Makefile.am: - - Adding codeset files to yet another makefile variant. + * ace/Makefile.am: Adding codeset files to yet another makefile + variant. Thu Mar 6 09:58:41 2003 Chad Elliott <elliott_c@ociweb.com> @@ -108,7 +112,11 @@ Wed Mar 5 06:32:40 2003 Phil Mesnier <mesnier_p@ociweb.com> * ace/ace_lib.dsp: Added codeset registry files and fixed spelling error in +<<<<<<< ChangeLog + Makefile.bor. +======= Makefile.bor. +>>>>>>> 4.4721 Wed Mar 5 06:10:48 2003 Phil Mesnier <mesnier_p@ociweb.com> diff --git a/apps/mkcsregdb/Makefile b/apps/mkcsregdb/Makefile index 9e9c05ed23c..d05f9bc3f26 100644 --- a/apps/mkcsregdb/Makefile +++ b/apps/mkcsregdb/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------------- BIN = mkcsregdb -INSBIN = $(ACE_ROOT)/bin/mkcsregdb +INSBIN = $(ACE_ROOT)/bin FILES = mkcsregdb diff --git a/apps/mkcsregdb/mkcsregdb.cpp b/apps/mkcsregdb/mkcsregdb.cpp index 9ede2c8bef4..90a07ef7b67 100644 --- a/apps/mkcsregdb/mkcsregdb.cpp +++ b/apps/mkcsregdb/mkcsregdb.cpp @@ -317,4 +317,3 @@ main (int argc, char ** argv) csdb.fini_output ("Codeset_Registry_db.cpp"); return 0; } - |