diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-09-22 12:06:54 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-09-22 12:06:54 +0000 |
| commit | 17a38c95c600c4c5b69f1a0252f48e6a3cbb9023 (patch) | |
| tree | 7cab62e778403d0ffc1e54bf6bc6759651e8e94e | |
| parent | 4023bd8724be9deb67e6b18ccf275337cb908037 (diff) | |
| download | ATCD-17a38c95c600c4c5b69f1a0252f48e6a3cbb9023.tar.gz | |
ChangeLogTag: Wed Sep 22 07:04:46 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 42 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 10 |
2 files changed, 33 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index 1248e6b9865..55cd906cdae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,33 +1,41 @@ +Wed Sep 22 07:04:46 2004 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Fixed a bug that I introduced in my Tue Sep 21 06:38:17 2004 + change. INSBIN can't be set to '.'. It causes many problematic + interations with rules.local.GNU and rules.nested.GNU. + Tue Sep 21 20:13:40 2004 J.T. Conklin <jtc@acorntoolworks.com> - * configure.ac: + * configure.ac: - Added checks for getipnodebyaddr() and getipnodebyname() which - set ACE_LACKS_GETIPNODEBYADDR and ACE_LACKS_GETIPNODEBYNAME. + Added checks for getipnodebyaddr() and getipnodebyname() which + set ACE_LACKS_GETIPNODEBYADDR and ACE_LACKS_GETIPNODEBYNAME. - * ace/OS_NS_netdb.inl: + * ace/OS_NS_netdb.inl: - Changed __GNUC__'s in conditionals to ACE_LACKS_GETIPNODEBYADDR - or ACE_LACKS_GETIPNODEBYNAME. + Changed __GNUC__'s in conditionals to ACE_LACKS_GETIPNODEBYADDR + or ACE_LACKS_GETIPNODEBYNAME. - * ace/config-linux-common.h: - * ace/config-netbsd.h: + * ace/config-linux-common.h: + * ace/config-netbsd.h: - Added #define for ACE_LACKS_GETIPNODEBYADDR and - ACE_LACKS_GETIPNODEBYNAME. + Added #define for ACE_LACKS_GETIPNODEBYADDR and + ACE_LACKS_GETIPNODEBYNAME. Tue Sep 21 17:50:27 2004 Steve Huston <shuston@riverace.com> - * examples/APG/Naming/naming.mpc: Correct the exename for Nodelocal. - It was conflicting with that of Netlocal, which, when generated, - confused Visual Age C++ templates and automake. + * examples/APG/Naming/naming.mpc: Correct the exename for Nodelocal. + It was conflicting with that of Netlocal, which, when generated, + confused Visual Age C++ templates and automake. Tue Sep 21 12:16:39 2004 Steve Huston <shuston@riverace.com> - * ACEXML/parser/parser/Parser.cpp: parse_encoding_decl(), don't - crash if the input source doesn't declare an encoding. - reset(), if current_ is already 0 (the case if no parsing ever - really got started) don't dereference it. + * ACEXML/parser/parser/Parser.cpp: parse_encoding_decl(), don't + crash if the input source doesn't declare an encoding. + reset(), if current_ is already 0 (the case if no parsing ever + really got started) don't dereference it. Tue Sep 21 18:00:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 627c1d3e5b7..5108db91d37 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -88,7 +88,9 @@ TAO_IDLFLAGS = <%tao_idlflags%> <%endif%> <%if(exename)%> -INSBIN ?= <%if(install)%><%install%><%else%>.<%endif%> +<%if(install)%> +INSBIN ?= <%install%> +<%endif%> OUTPUT_DIRECTORY = $(INSBIN) <%else%> <%if(dllout || libout)%> @@ -121,10 +123,12 @@ all: $(TEMPINCDIR) endif +ifneq ($(OUTPUT_DIRECTORY),) all: $(OUTPUT_DIRECTORY) $(OUTPUT_DIRECTORY): -@mkdir -p "$(OUTPUT_DIRECTORY)" +endif <%if(sharedname || staticname || exename)%> <%if(libs && libpaths)%> @@ -290,12 +294,14 @@ LSRC = $(addsuffix .cpp, $(FILES)) include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -<%if(install && exename)%> +<%if(exename)%> +ifneq ($(OUTPUT_DIRECTORY),) ifneq ($(OUTPUT_DIRECTORY),.) INSTALL = $(VBIN:%=$(INSBIN)/%) CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%) endif +endif <%endif%> <%if(sharedname || staticname)%> |