incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1348771 - in /incubator/ooo/trunk/main/solenv/inc: tg_ext.mk unitools.mk
Date Mon, 11 Jun 2012 09:34:39 GMT
Author: af
Date: Mon Jun 11 09:34:37 2012
New Revision: 1348771

URL: http://svn.apache.org/viewvc?rev=1348771&view=rev
Log:
Fixed test for existing directory, not file.

Modified:
    incubator/ooo/trunk/main/solenv/inc/tg_ext.mk
    incubator/ooo/trunk/main/solenv/inc/unitools.mk

Modified: incubator/ooo/trunk/main/solenv/inc/tg_ext.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_ext.mk?rev=1348771&r1=1348770&r2=1348771&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_ext.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_ext.mk Mon Jun 11 09:34:37 2012
@@ -159,7 +159,7 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/
 
 #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)

Modified: incubator/ooo/trunk/main/solenv/inc/unitools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unitools.mk?rev=1348771&r1=1348770&r2=1348771&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/unitools.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/unitools.mk Mon Jun 11 09:34:37 2012
@@ -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



Mime
View raw message