diff --git a/ChangeLog b/ChangeLog index 5a4d099e..70fa68ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Oct 16 11:23:05 1997 Ovidiu Predescu + + * ld_lib_path.sh: Set IFS to blank and newline to make the for loop + run correctly. Remove double quotes around $additional_library_paths + in the for loop. + * openapp.in: Put double quotes around the cat command when obtaining + the value for additional_library_paths. + * transform_paths.sh: Search through all the directories in $@, + not in "$*". + Wed Oct 15 12:14:42 1997 Ovidiu Predescu Better support for building applications. diff --git a/application.make b/application.make index 099dee64..08d25c82 100644 --- a/application.make +++ b/application.make @@ -59,10 +59,9 @@ endif # $(APP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) - $(LD) $(ALL_LDFLAGS) $(LDOUT)$@ \ - $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \ + $(LD) $(ALL_LDFLAGS) $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \ $(ALL_LIB_DIRS) $(ALL_GUI_LIBS) - @$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \ + $(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \ >$(APP_DIR_NAME)/library_paths.openapp ifeq ($(OBJC_COMPILER), NeXT) # This is a hack for OPENSTEP systems to remove the iconheader file diff --git a/ld_lib_path.sh b/ld_lib_path.sh index 9daad90f..7aad0357 100755 --- a/ld_lib_path.sh +++ b/ld_lib_path.sh @@ -35,6 +35,9 @@ if [ -z "$host_os" ]; then host_os=$1 fi +old_IFS="$IFS" +IFS=" +" case "$host_os" in @@ -42,7 +45,7 @@ case "$host_os" in ld_lib_path="DYLD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$DYLD_LIBRARY_PATH" if [ -n "$additional_library_paths" ]; then - for dir in "$additional_library_paths"; do + for dir in $additional_library_paths; do additional="${additional}${dir}:" done fi @@ -53,7 +56,7 @@ case "$host_os" in ld_lib_path="LD_LIBRARY_PATH" LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part;$GNUSTEP_LOCAL_ROOT/$last_path_part;$GNUSTEP_SYSTEM_ROOT/$last_path_part;$LD_LIBRARY_PATH" if [ -n "$additional_library_paths" ]; then - for dir in "$additional_library_paths"; do + for dir in $additional_library_paths; do additional="${additional}${dir};" done fi @@ -64,7 +67,7 @@ case "$host_os" in ld_lib_path="LD_LIBRARY_PATH" LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$LD_LIBRARY_PATH" if [ -n "$additional_library_paths" ]; then - for dir in "$additional_library_paths"; do + for dir in $additional_library_paths; do additional="${additional}${dir}:" done fi @@ -77,3 +80,5 @@ esac if [ "$export_variable" != yes ]; then echo $ld_lib_path fi + +IFS="$old_IFS" diff --git a/openapp.in b/openapp.in index fb3693a5..23c1e67a 100755 --- a/openapp.in +++ b/openapp.in @@ -67,7 +67,7 @@ if [ -z "$full_appname" ]; then fi if [ -f "$full_appname/library_paths.openapp" ]; then - additional_library_paths=`cat $full_appname/library_paths.openapp` + additional_library_paths="`cat $full_appname/library_paths.openapp`" fi appname=`echo $app | sed 's/\.[a-z]*$//'` diff --git a/transform_paths.sh b/transform_paths.sh index 78ee2b2f..f45a66ad 100755 --- a/transform_paths.sh +++ b/transform_paths.sh @@ -27,8 +27,8 @@ fi curdir=`pwd` -for dir in "$*"; do +for dir in $@; do if [ -d $curdir/$dir ]; then - echo `(cd $curdir/$dir; pwd)` + echo "`(cd $curdir/$dir; pwd)`" fi done