Minor change to avoid shell parse errors if RESOURCE_FILES is not defined.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2543 72102866-910b-0410-8b05-ffd578937521

.cvsignore

@@ -7,3 +7,4 @@ GNUstep.sh
 config.h
 config.status
 openapp
+debugapp

ChangeLog

@@ -1,3 +1,10 @@
+Tue Oct 21 17:31:27 1997  Ovidiu Predescu <ovidiu@net-community.com>
+
+	* application.make (app-resource-files): Check to see if the
+	RESOURCE_FILES variable is defined so we don't get sh parse errors.
+	* target.make (OPENSTEP targets): Also search for libraries when
+	building a shared library in ADDITIONAL_LIB_DIRS.
+
 Mon Oct 20 08:48:02 1997  Scott Christley  <scottc@net-community.com>
 
 	* rules.make: (%.tool): Rename to %.buildtool.

application.make

@@ -96,9 +96,10 @@ $(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
 endif
 
 app-resource-files::
-	for f in $(RESOURCE_FILES); do \
-	  $(INSTALL_DATA) $$f $(APP_DIR_NAME)/$$f ;\
-	done
+	@(if [ "$(RESOURCE_FILES)" != "" ]; then \
+	  echo "Copying resources into the application wrapper..."; \
+	  cp -r $(RESOURCE_FILES) $(APP_DIR_NAME); \
+	fi)
 
 else
 # This part gets included by the first invoked make process.

target.make

@@ -94,6 +94,7 @@ SHARED_LIB_LINK_CMD     = \
                 -L$(GNUSTEP_USER_ROOT)/$(TARGET_LIB_DIR) \
 		-L$(GNUSTEP_LOCAL_ROOT)/$(TARGET_LIB_DIR) \
 		-L$(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR) \
+		$(ADDITIONAL_LIB_DIRS) \
 		$(LIBRARIES_DEPEND_UPON) -lobjc -lgcc $^; \
 	(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
           $(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
@@ -103,7 +104,8 @@ SHARED_LIB_LINK_CMD     = \
 		-framework System \
                 -L$(GNUSTEP_USER_ROOT)/$(TARGET_LIB_DIR) \
 		-L$(GNUSTEP_LOCAL_ROOT)/$(TARGET_LIB_DIR) \
-		-L$(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR); \
+		-L$(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR) \
+		$(ADDITIONAL_LIB_DIRS) $^; \
 	(cd $(GNUSTEP_OBJ_DIR); rm -f $(LIBRARY_FILE); \
           $(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
 endif