diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-13 10:03:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-13 10:03:30 +0000 |
| commit | ea731c7981ff4e47c066f17aa0aeb8923d7c06aa (patch) | |
| tree | 697f5cda26a96c5b521836de375e69b6e53a9b6f | |
| parent | 4c31d8b63a2d9639394b3eb29ec0034c8f8b866a (diff) | |
| download | ATCD-ea731c7981ff4e47c066f17aa0aeb8923d7c06aa.tar.gz | |
Tue Oct 13 10:03:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/rules.local.GNU:
When using cp to install a library, make sure we check date/time
in order to check if we need to copy. Thanks to Abdul Sowayan
<sowayan at gmail dot com> for reporting this. This fixes bugzilla
3728
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/include/makeinclude/rules.local.GNU | 15 |
2 files changed, 8 insertions, 15 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 4cec62cabd7..838787120da 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Tue Oct 13 10:03:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/rules.local.GNU: + When using cp to install a library, make sure we check date/time + in order to check if we need to copy. Thanks to Abdul Sowayan + <sowayan at gmail dot com> for reporting this. This fixes bugzilla + 3728 + Tue Oct 13 09:44:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tests/INET_Addr_Test.cpp: diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index b0be710744c..8d7daa9f08d 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -284,7 +284,6 @@ ifeq ($(vxworks_ntbuild),1) $(RM) $@ && \ $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@ else #not vxworks_ntbuild - ifeq ($(mingw32),1) #If we're actually copying instead of linking, pay attention to timestamps to know when to install ifeq ($(firstword $(LN_S)),cp) ifneq ($(SOVERSION),) @@ -319,20 +318,6 @@ else #not vxworks_ntbuild fi ; \ fi endif #firstword - else #not mingw32 - @if test $(ARCH_SOURCE_DIR) != $(@D) -o -n "$(SOVERSION)" ; then \ - if test -s $@ ; then \ - echo "$(@F) already installed" ; \ - else \ - echo "Installing $(@F:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) -> $(@D)" ; \ - $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ - $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ - echo "Installing $(@F) -> $(@D)" ; \ - $(RM) $@; \ - $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@; \ - fi ; \ - fi - endif #mingw32 endif #vxworks_ntbuild ifdef MVSLIB |