[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r779 - trunk/xsfbs



Author: dnusinow
Date: 2005-10-24 21:08:40 -0500 (Mon, 24 Oct 2005)
New Revision: 779

Modified:
   trunk/xsfbs/xsfbs.mk
Log:
Make the make-orig-tar-gz target really useful for the modular tree

Modified: trunk/xsfbs/xsfbs.mk
===================================================================
--- trunk/xsfbs/xsfbs.mk	2005-10-25 01:58:35 UTC (rev 778)
+++ trunk/xsfbs/xsfbs.mk	2005-10-25 02:08:40 UTC (rev 779)
@@ -317,18 +317,16 @@
 .PHONY: make-orig-tar-gz
 make-orig-tar-gz: clean prune-upstream-tree
 	CURDIR=$(shell basename `pwd`)
-	echo "$(CURDIR)"
 	( cd .. \
-	  && if ! [ -d $(SOURCE_NAME)-$(UPSTREAM_VERSION) ]; then \
-	    echo "../$(SOURCE_NAME)-$(UPSTREAM_VERSION) does not exist or is" \
-	         "not a directory." >&2; \
+	  && if [ $(CURDIR) != $(SOURCE_NAME)-$(UPSTREAM_VERSION) ]; then \
+	    echo "Our current working directory has the wrong name. Renaming..." >&2; \
 		mv $(CURDIR) $(SOURCE_NAME)-$(UPSTREAM_VERSION); \
-	  else \
+	  fi; \
 	    tar --exclude=debian --exclude=debian/* \
 	        --exclude=.svn --exclude=.svn/* \
 	        -cf - $(SOURCE_NAME)-$(UPSTREAM_VERSION) \
 	    | gzip -9 >$(SOURCE_NAME)_$(UPSTREAM_VERSION).orig.tar.gz; \
-	  fi )
+	   )
 
 # Verify that there are no offsets or fuzz in the patches we apply.
 #



Reply to: