From 89212ba6030a12f13f1d6d96110101e62398dec1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 23 Nov 2012 12:33:31 +0000 Subject: Fri Nov 23 12:33:16 UTC 2012 Johnny Willemsen * include/makeinclude/rules.lib.GNU: Fix for AIX --- ACE/ChangeLog | 5 +++++ ACE/include/makeinclude/rules.lib.GNU | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 02d0072cb5b..38ce33ec30d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 23 12:33:16 UTC 2012 Johnny Willemsen + + * include/makeinclude/rules.lib.GNU: + Fix for AIX + Fri Nov 23 12:28:20 UTC 2012 Johnny Willemsen * ace/Service_Config.h: diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 3246912f54d..f1269e63d52 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -22,10 +22,12 @@ ifneq ($(versioned_so),0) ifeq ($(SOVERSION),) ifeq ($(versioned_so),1) SOVERSION = .$(GNUACE_PROJECT_VERSION) - else ifeq ($(versioned_so),2) - SOVERSION = -$(GNUACE_PROJECT_VERSION) else - $(error unknown value for versioned_so: $(versioned_so)) + ifeq ($(versioned_so),2) + SOVERSION = -$(GNUACE_PROJECT_VERSION) + else + $(error unknown value for versioned_so: $(versioned_so)) + endif endif endif # SOVERSION @@ -34,8 +36,10 @@ ifneq ($(versioned_so),0) ifeq ($(SONAME),) ifeq ($(versioned_so),1) SONAME = $(SHLIB)$(SOVERSION) - else ifeq ($(versioned_so),2) - SONAME = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) + else + ifeq ($(versioned_so),2) + SONAME = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) + endif endif endif # SONAME endif # versioned_so -- cgit v1.2.1