diff options
| author | Andre Fischer <af@apache.org> | 2012-06-11 08:34:37 +0000 |
|---|---|---|
| committer | Andre Fischer <af@apache.org> | 2012-06-11 08:34:37 +0000 |
| commit | 689ad6ef945906fef934331834afd1cb715e377b (patch) | |
| tree | 5c2fb0138586c7482b7163cb58bddb230520971d | |
| parent | 44f7914e0606caff822957b189a4459ccc5e2aad (diff) | |
Fixed test for existing directory, not file.
Notes
Notes:
ignore: obsolete
| -rw-r--r-- | solenv/inc/tg_ext.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 85b1cdb7f26f..332c0ca45690 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -159,7 +159,7 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar #do unpack $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP) - $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI) + $(IFDIREXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) echo "moving" && $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI) $(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index c0e62629eebc..d2ad9e5e010a 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -63,6 +63,7 @@ NULLDEV:=/dev/null # iz29609 helpmacro to check if file exists IFEXIST:=if [ -f +IFDIREXIST:=if [ -d IFNOTEXIST:= if ! test -f THEN:= ] ; then FI:= ; fi |