>From a2919cebf18cd6222a994028e0c30a5140dbc476 Mon Sep 17 00:00:00 2001 From: Christian Kellermann Date: Sat, 2 Feb 2013 17:57:43 +0100 Subject: [PATCH] Apply the same naming scheme for .so libs in "libs" target as for "install-libs" The install-libs target creates a shared object libchicken with the naming scheme "$(LIBCHICKEN_SO_FILE).$(BINARYVERSION)" and a symlink $(LIBCHICKEN_SO_FILE) pointing to it. The libs target did it the opposite way. As I understand it the libs target is mainly used in cross compilation, however using it as it is will confuse the user when later on a install-dev target is run. Install-dev itself depends on install-libs which results then in a dangling symlink $(LIBCHICKEN_SO_FILE) as the $(LIBCHICKEN_SO_FILE).$(BINARYVERSION) gets overwritten. This patch salvages this situation making the behaviour consistent. --- rules.make | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rules.make b/rules.make index db36969..18c4baf 100644 --- a/rules.make +++ b/rules.make @@ -225,7 +225,8 @@ lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO): $(LIBCHICKEN_SHARED_OBJECTS) $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_LINKER_OPTIONS) \ $(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES) ifdef USES_SONAME - ln -sf $(LIBCHICKEN_SO_FILE) $(LIBCHICKEN_SO_FILE).$(BINARYVERSION) + mv $(LIBCHICKEN_SO_FILE) $(LIBCHICKEN_SO_FILE).$(BINARYVERSION) + ln -sf $(LIBCHICKEN_SO_FILE).$(BINARYVERSION) $(LIBCHICKEN_SO_FILE) endif cyg$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)-0.dll: $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT) -- 1.7.6