diff --git a/ChangeLog b/ChangeLog index 40cba88e..f8965e8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * bundle.make ($(BUNDLE_DIR_NAME)/Contents/Resources): Remove -f (Solaris ln -f doesn't work). + * target.make (LIBRARY_INSTALL_DIR): Update for last change + removing GNUSTEP_TARGET_DIR. + Tue Oct 16 03:30:08 2001 Nicola Pero Warning - very minor backwards incompatible change in the API, diff --git a/target.make b/target.make index 63dba2a9..b56df0f5 100644 --- a/target.make +++ b/target.make @@ -98,12 +98,13 @@ STATIC_LIB_LINK_CMD = \ $(AR) $(ARFLAGS) $(AROUT)$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^;\ $(RANLIB) $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) AFTER_INSTALL_STATIC_LIB_COMMAND = \ - (cd $(LIBRARY_INSTALL_DIR); $(RANLIB) $(VERSION_LIBRARY_FILE)) + (cd $(LIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR); \ + $(RANLIB) $(VERSION_LIBRARY_FILE)) SHARED_LIB_LINK_CMD = SHARED_CFLAGS = SHARED_LIBEXT = AFTER_INSTALL_SHARED_LIB_COMMAND = \ - (cd $(LIBRARY_INSTALL_DIR); \ + (cd $(LIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR); \ rm -f $(LIBRARY_FILE); \ $(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE)) HAVE_BUNDLES = no @@ -458,7 +459,7 @@ SHARED_FRAMEWORK_LINK_CMD = \ rm -f $(FRAMEWORK_LIBRARY_FILE); \ $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE)) AFTER_INSTALL_SHARED_LIB_COMMAND = \ - (cd $(LIBRARY_INSTALL_DIR); \ + (cd $(LIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR); \ rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \ @@ -550,7 +551,7 @@ SHARED_FRAMEWORK_LINK_CMD = \ $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \ $(LN_S) $(SONAME_FRAMEWORK_FILE) $(FRAMEWORK_LIBRARY_FILE)) AFTER_INSTALL_SHARED_LIB_COMMAND = \ - (cd $(LIBRARY_INSTALL_DIR); \ + (cd $(LIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR); \ rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \ @@ -858,7 +859,7 @@ SHARED_FRAMEWORK_LINK_CMD = \ rm -f $(FRAMEWORK_LIBRARY_FILE); \ $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE)) AFTER_INSTALL_SHARED_LIB_COMMAND = \ - (cd $(LIBRARY_INSTALL_DIR); \ + (cd $(LIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR); \ rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \