diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-06-18 11:09:59 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-06-18 11:09:59 -0500 |
| commit | 70dbf3eaa502ada6723ee70bc5f1cdbc38990776 (patch) | |
| tree | c24e3a44a45919a1470b8b4bfbf8621b8db09b35 | |
| parent | 78cc1a6348d9e7041dd4179796cc2bcbc56d311b (diff) | |
| download | ATCD-70dbf3eaa502ada6723ee70bc5f1cdbc38990776.tar.gz | |
Allow the INSLIB make variable to empty.
| -rw-r--r-- | ACE/include/makeinclude/rules.lib.GNU | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index eb5c50946f7..94868ff0d87 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -119,20 +119,22 @@ ifdef ARCH ARCHDIR = $(ARCH)/ endif -ifdef static_libs - LIB_INSTALL += $(VLIB:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:$(ARCHDIR)%=$(INSLIB)/%) -endif # static_libs +ifneq ($(INSLIB),) + ifdef static_libs + LIB_INSTALL += $(VLIB:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VLIB:$(ARCHDIR)%=$(INSLIB)/%) + endif # static_libs -ifdef shared_libs - LIB_INSTALL += $(VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:$(ARCHDIR)%=$(INSLIB)/%*) - ifdef SHLIBA - LIB_INSTALL += $(VSHLIBA:$(ARCHDIR)%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_SHLIBA:$(ARCHDIR)%=$(INSLIB)/%) - endif -endif # shared_libs + ifdef shared_libs + LIB_INSTALL += $(VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VSHLIB:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:$(ARCHDIR)%=$(INSLIB)/%*) + ifdef SHLIBA + LIB_INSTALL += $(VSHLIBA:$(ARCHDIR)%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_SHLIBA:$(ARCHDIR)%=$(INSLIB)/%) + endif + endif # shared_libs +endif # INSLIB ace_lib_prelink ?= 0 aix_build ?= 0 |