Author: rfm
Date: Fri May 13 17:58:30 2016
New Revision: 39756
URL: http://svn.gna.org/viewcvs/gnustep?rev=39756&view=rev
Log:
framework versioning fix
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/Instance/framework.make
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=39756&r1=39755&r2=39756&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Fri May 13 17:58:30 2016
@@ -1,3 +1,9 @@
+2016-05-13 Yavor Doganov <[email protected]>
+
+ * Instance/framework.make:
+ Forgotten patch to allow multiple versions of a framework to be
+ installed.
+
2016-05-13 Richard Frith-Macdonald <[email protected]>
* GNUmakefile.in:
Modified: tools/make/trunk/Instance/framework.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/Instance/framework.make?rev=39756&r1=39755&r2=39756&view=diff
==============================================================================
--- tools/make/trunk/Instance/framework.make (original)
+++ tools/make/trunk/Instance/framework.make Fri May 13 17:58:30 2016
@@ -1,4 +1,4 @@
-# -*-makefile-*-
+# -*-makefile-gmake-*-
# Instance/framework.make
#
# Instance Makefile rules to build GNUstep-based frameworks.
@@ -391,10 +391,6 @@
$(UPDATE_CURRENT_SYMLINK_RULE)
ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes)
$(ECHO_NOTHING)cd $(FRAMEWORK_DIR); \
- if [ ! -h "Resources" ]; then \
- $(RM_LN_S) Resources; \
- $(LN_S_RECURSIVE) Versions/Current/Resources Resources; \
- fi; \
if [ ! -h "Headers" ]; then \
$(RM_LN_S) Headers; \
$(LN_S_RECURSIVE) Versions/Current/Headers Headers; \
@@ -661,8 +657,10 @@
internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \
$(GNUSTEP_HEADERS)
- $(ECHO_INSTALLING)rm -rf
$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \
- (cd $(GNUSTEP_BUILD_DIR); $(TAR) cfX -
$(GNUSTEP_MAKEFILES)/tar-exclude-list $(FRAMEWORK_DIR_NAME)) | (cd
$(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
+ $(ECHO_INSTALLING)(cd $(GNUSTEP_BUILD_DIR); \
+ $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list \
+ $(FRAMEWORK_DIR_NAME)) \
+ | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO)
$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO)
endif
@@ -683,10 +681,10 @@
$(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); \
+ if test -r
"$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)";
then \
+ $(LN_S) `$(REL_PATH_SCRIPT)
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)
$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_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)
+ $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)
$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)
short` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \
$(CHOWN) $(CHOWN_TO) $(FRAMEWORK_LIBRARY_FILE); \
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
