| 1 |
commit: 122127fc0c786f1e33f90968575c10c690c50344 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Thu Apr 3 19:22:59 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Thu Apr 3 19:22:59 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=122127fc |
| 7 |
|
| 8 |
Makefile: DIST_{TAR,BZIP2,GZIP,XZ} |
| 9 |
|
| 10 |
--- |
| 11 |
Makefile | 25 ++++++++++++++++++++----- |
| 12 |
1 file changed, 20 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/Makefile b/Makefile |
| 15 |
index 2b973f5..1e96354 100644 |
| 16 |
--- a/Makefile |
| 17 |
+++ b/Makefile |
| 18 |
@@ -44,6 +44,10 @@ RELEASE_NOT_DIRTY := n |
| 19 |
RELEASE_DIRTY_SUFFIX := -dirty |
| 20 |
VBUMP_COMMIT := y |
| 21 |
DIST_PYDOC := y |
| 22 |
+DIST_TAR := n |
| 23 |
+DIST_GZIP := n |
| 24 |
+DIST_BZIP2 := y |
| 25 |
+DIST_XZ := n |
| 26 |
|
| 27 |
MANIFEST := $(S)/MANIFEST |
| 28 |
LICENSES_FILE := $(S)/files/licenses |
| 29 |
@@ -268,8 +272,8 @@ generate-files-commit: gemerate-files |
| 30 |
# creates a src tarball (.tar.bz2) |
| 31 |
PHONY += dist |
| 32 |
dist: distclean generate-files $(_DIST_PYDOC_DEP) | $(PKG_DISTDIR) |
| 33 |
-ifeq ($(X_BZIP2)$(X_GZIP)$(X_XZ),) |
| 34 |
- $(error at least one of X_BZIP2, X_GZIP, X_XZ must be set) |
| 35 |
+ifeq ($(DIST_TAR)$(DIST_BZIP2)$(DIST_GZIP)$(DIST_XZ),) |
| 36 |
+ $(error at least one of DIST_{TAR,BZIP2,GZIP,XZ} must be set) |
| 37 |
endif |
| 38 |
$(eval MY_$@_BASEVER := $(shell cat $(VERSION_FILE))) |
| 39 |
test -n '$(MY_$@_BASEVER)' |
| 40 |
@@ -294,19 +298,25 @@ endif |
| 41 |
|
| 42 |
tar c -C $(SRC_DOCDIR)/ . -f $(MY_$@_DOCFILE).make_tmp |
| 43 |
|
| 44 |
-ifneq ($(X_BZIP2),) |
| 45 |
+ifeq ($(DIST_BZIP2),$(filter $(DIST_BZIP2),$(_TRUE_WORDS))) |
| 46 |
$(X_BZIP2) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2 |
| 47 |
$(X_BZIP2) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).bz2 |
| 48 |
endif |
| 49 |
-ifneq ($(X_GZIP),) |
| 50 |
+ifeq ($(DIST_GZIP),$(filter $(DIST_GZIP),$(_TRUE_WORDS))) |
| 51 |
$(X_GZIP) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).gz |
| 52 |
$(X_GZIP) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).gz |
| 53 |
endif |
| 54 |
-ifneq ($(X_XZ),) |
| 55 |
+ifeq ($(DIST_XZ),$(filter $(DIST_XZ),$(_TRUE_WORDS))) |
| 56 |
$(X_XZ) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).xz |
| 57 |
$(X_XZ) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).xz |
| 58 |
endif |
| 59 |
+ifeq ($(DIST_TAR),$(filter $(DIST_TAR),$(_TRUE_WORDS))) |
| 60 |
+ mv -f -- $(MY_$@_FILE).make_tmp $(MY_$@_FILE) |
| 61 |
+ mv -f -- $(MY_$@_DOCFILE).make_tmp $(MY_$@_DOCFILE) |
| 62 |
+else |
| 63 |
rm -- $(MY_$@_FILE).make_tmp |
| 64 |
+ rm -- $(MY_$@_DOCFILE).make_tmp |
| 65 |
+endif |
| 66 |
|
| 67 |
|
| 68 |
# rule for compressing a deprule file |
| 69 |
@@ -514,6 +524,11 @@ endif |
| 70 |
@echo ' tarball (y) or not (n) [$(DIST_PYDOC)]' |
| 71 |
@echo '* PKG_DISTDIR - directory for storing source tarballs' |
| 72 |
@echo ' [$(PKG_DISTDIR:$(CURDIR)/%=%)]' |
| 73 |
+ @echo '* DIST_TAR - whether to create .tar tarballs [$(DIST_TAR)]' |
| 74 |
+ @echo '* DIST_BZIP2 - whether to create .tar.bz2 tarballs [$(DIST_BZIP2)]' |
| 75 |
+ @echo '* DIST_GZIP - whether to create .tar.gzip tarballs [$(DIST_GZIP)]' |
| 76 |
+ @echo '* DIST_XZ - whether to create .tar.xz tarballs [$(DIST_XZ)]' |
| 77 |
+ |
| 78 |
|
| 79 |
|
| 80 |
PHONY += FORCE |
Archives