Merge branch 'release/2.0.1'

openSUSE · Jul 2, 2015 · 14e0ca8 · 14e0ca8
2 parents 5bee84a + 225f9af
commit 14e0ca8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 build/
+tmp/
+.tmp/
 \#*#
 .#*
 *~

diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Tue Jul 01 16:40:00 UTC 2015 - [email protected]
+Tue Jul 02 09:11:00 UTC 2015 - [email protected]
 
 Stable release 2.0.1
 

diff --git a/Makefile b/Makefile
@@ -12,6 +12,7 @@ endif
 SHELL         := /bin/bash
 PACKAGE       := suse-xsl-stylesheets
 VERSION       := 2.0.1
+CDIR          := $(shell pwd)
 DIST_EXCLUDES := packaging/exclude-files_for_susexsl_package.txt
 SUSE_XML_PATH := $(PREFIX)/xml/suse
 DB_XML_PATH   := $(PREFIX)/xml/docbook
@@ -274,9 +275,9 @@ $(INST_DIRECTORIES) $(DEV_DIRECTORIES) $(BUILD_DIR):
 
 .PHONY: dist
 dist: | $(BUILD_DIR)
-	@tar cfjh $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.bz2 \
-	  --exclude-from=$(DIST_EXCLUDES) \
-	  --transform 's:./:suse-xsl-stylesheets-$(VERSION)/:' .
+	@tar cfjhP $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.bz2 \
+	  -C $(CDIR) --exclude-from=$(DIST_EXCLUDES) \
+	  --transform 's:^$(CDIR):suse-xsl-stylesheets-$(VERSION):' $(CDIR)
 	@echo "Successfully created $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.bz2"
 
 PHONY: dist-clean