diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-08 21:35:12 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-08 21:35:12 +0000 |
| commit | 470f1b4e6d3913d66bfa720450c3b73a8b97ac8c (patch) | |
| tree | ae1b89baf87aa21b659be957fa16110094bef157 /include/makeinclude/rules.local.GNU | |
| parent | d8cb3fc729c2e87e7016b601e3bb751c981d114c (diff) | |
| download | ATCD-470f1b4e6d3913d66bfa720450c3b73a8b97ac8c.tar.gz | |
Rename ACE_LDSO_Major_Minor_Version_Number to ACE_LDSO_Version_Number.
Put back current directory check with check for null ACE_LDSO_Version_Number.
Diffstat (limited to 'include/makeinclude/rules.local.GNU')
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index 6a0518d1ba8..b59b4d74a11 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -114,7 +114,7 @@ deinstall.local: $(INSBIN)/%$(VAR) \ $(INSINC)/ace% \ $(INSLIB)/%$(VAR).a \ -$(INSLIB)/%$(VAR).$(SOEXT)$(ACE_LDSO_Major_Minor_Version_Number) \ +$(INSLIB)/%$(VAR).$(SOEXT)$(ACE_LDSO_Version_Number) \ $(INSMAN)/man1/% \ $(INSMAN)/man2/% \ $(INSMAN)/man3/% \ @@ -125,11 +125,13 @@ $(INSMAN)/man7/% \ $(INSMAN)/man8/% \ $(INSMAN)/manl/% \ $(INSMAN)/mann/% : - @if test -s $@ ; then \ - echo "$(@F) already installed" ; \ - else \ - echo "Installing $(@F) -> $(@D)" ; \ - ln -s $(shell pwd)/$(@F:%.$(SOEXT)$(ACE_LDSO_Major_Minor_Version_Number)=%.$(SOEXT)) $(@) ; \ + @if test $(shell pwd) != $(@D) -o -n $(ACE_LDSO_Version_Number) ; then \ + if test -s $@ ; then \ + echo "$(@F) already installed" ; \ + else \ + echo "Installing $(@F) -> $(@D)" ; \ + ln -s $(shell pwd)/$(@F:%.$(SOEXT)$(ACE_LDSO_Version_Number)=%.$(SOEXT)) $(@) ; \ + fi ; \ fi ifdef MVSLIB #special for MVS in order to use the .x files |