51 lines
3.0 KiB
Plaintext
51 lines
3.0 KiB
Plaintext
$OpenBSD: patch-Instance_framework_make,v 1.7 2010/11/24 07:10:44 sebastia Exp $
|
|
--- Instance/framework.make.orig Mon Feb 15 00:13:47 2010
|
|
+++ Instance/framework.make Thu Nov 18 11:11:02 2010
|
|
@@ -252,7 +252,7 @@ FRAMEWORK_CURRENT_LIBRARY_DIR = $(GNUSTEP_BUILD_DIR)/$
|
|
ifneq ($(BUILD_DLL), yes)
|
|
|
|
FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE)$(SHARED_LIBEXT)
|
|
-VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION)
|
|
+VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION)
|
|
SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION)
|
|
|
|
else # BUILD_DLL
|
|
@@ -557,13 +557,7 @@ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(G
|
|
$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
|
|
ifeq ($(MAKE_CURRENT_VERSION),yes)
|
|
$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \
|
|
- $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \
|
|
- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \
|
|
- Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) short` \
|
|
- $(GNUSTEP_INSTANCE); \
|
|
- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \
|
|
- Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(FRAMEWORK_LIBRARY_FILE) short` \
|
|
- $(FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
|
|
+ $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -590,8 +584,7 @@ endif
|
|
$(ECHO_LINKING) \
|
|
$(LIB_LINK_CMD) || $(RM) $(FRAMEWORK_FILE) ; \
|
|
(cd $(LIB_LINK_OBJ_DIR); \
|
|
- $(RM_LN_S) $(GNUSTEP_INSTANCE); \
|
|
- $(LN_S) $(LIB_LINK_FRAMEWORK_FILE) $(GNUSTEP_INSTANCE)) \
|
|
+ $(RM_LN_S) $(GNUSTEP_INSTANCE)) \
|
|
$(END_ECHO)
|
|
|
|
ifeq ($(GNUSTEP_MAKE_PARALLEL_BUILDING), no)
|
|
@@ -679,11 +672,7 @@ endif
|
|
$(RM_LN_S) $(FRAMEWORK_LIBRARY_FILE); \
|
|
$(RM_LN_S) $(SONAME_FRAMEWORK_FILE); \
|
|
$(RM_LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE); \
|
|
- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) short` $(FRAMEWORK_LIBRARY_FILE); \
|
|
- if test -r "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \
|
|
- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE) short` $(SONAME_FRAMEWORK_FILE); \
|
|
- fi; \
|
|
- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) short` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
|
|
+ mv `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
|
|
ifneq ($(CHOWN_TO),)
|
|
$(ECHO_CHOWNING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \
|
|
$(CHOWN) $(CHOWN_TO) $(FRAMEWORK_LIBRARY_FILE); \
|