Commit 0af92f5e authored by Eric Andersen's avatar Eric Andersen
Browse files

Paul Fox writes: 

hi erik --

bash versions 2.04.11 and 2.04.21 (at least -- they're the only
non-2.05 versions i have) seem to get the "older than" (test -ot)
answer wrong if one of the files is missing.

this patch explicitly bypasses the test if the "older" file is missing.

paul
parent 21a6d610

make/sed.mk

+15 −12
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ $(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured 
build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)

	@if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \

		rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi;

	@if [ $(STAGING_DIR)/$(SED_TARGET_BINARY) -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \

       @if [ ! -f $(STAGING_DIR)/$(SED_TARGET_BINARY) -o $(STAGING_DIR)/$(SED_TARGET_BINARY) \

       -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \

	    set -x; \

	    $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) install; \

	    mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \
@@ -113,7 +114,9 @@ $(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured 
sed-target_binary: $(SED_DIR2)/$(SED_BINARY)

	@if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \

		rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi;

	@if [ $(TARGET_DIR)/$(SED_TARGET_BINARY) -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \



       @if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \

       -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \

	    set -x; \

	    $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \

	    mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \