summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2012-07-15 09:24:03 +0200
committerAndreas Baumann <abaumann@yahoo.com>2012-07-15 09:24:03 +0200
commit20b6bb141bb38ae1a30f85a483ae79f7d6666300 (patch)
tree8ea2ee72ddb91fc428f9835f64dfc5d053588636
parentb7d0a433c02fa4be91c20ede83746ccbdf7c415c (diff)
downloadnagios-plugin-curl-20b6bb141bb38ae1a30f85a483ae79f7d6666300.tar.gz
nagios-plugin-curl-20b6bb141bb38ae1a30f85a483ae79f7d6666300.tar.bz2
fixed dist for git
-rw-r--r--makefiles/dist.mk50
1 files changed, 34 insertions, 16 deletions
diff --git a/makefiles/dist.mk b/makefiles/dist.mk
index ff4f1ab..dc80907 100644
--- a/makefiles/dist.mk
+++ b/makefiles/dist.mk
@@ -1,25 +1,43 @@
-# creates distribution tarball
+# creates a source tarball ready for distribution
#
# requires:
# - PACKAGE_NAME
# - PACKAGE_VERSION
#
# provides:
-# - targets 'dist', 'dist-gz'
+# - target: dist
+# - target: dist-bz2, dist-gz, dist-Z
-.PHONY: dist dist-gz
-dist: distclean
- test -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar || rm -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar
- test -d /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION) || rm -rf /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
- find . -type f | grep -v .svn | \
- xargs tar cf /tmp/pre
- mkdir /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
- cd /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION) && \
- tar xf ../pre && rm -f ../pre && cd .. && \
- tar cvf /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar $(PACKAGE_NAME)-$(PACKAGE_VERSION)
- rm -rf /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
- mv -f /tmp/$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar .
+.PHONY: dist dist-bz2 dist-gz dist-Z
+
+TMPDIR ?= /tmp
+
+dist:
+ -@rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ -@rm -rf $(TMPDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ mkdir $(TMPDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ cp -r * $(TMPDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/.
+ -@cd $(TMPDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) ; \
+ $(MAKE) distclean ; \
+ rm -f makefiles/gmake/platform.mk.vars; \
+ rm -f makefiles/gmake/platform.vars; \
+ find . -name .svn -exec rm -rf {} \; ; \
+ find . -name .git -exec rm -rf {} \; ; \
+ cd .. ; \
+ tar cvf $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar \
+ $(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ -@rm -rf $(TMPDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ @mv $(TMPDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar .
+
+dist-bz2: dist
+ -@rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION).bz2
+ @bzip2 -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar
dist-gz: dist
- rm -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
- gzip $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar
+ -@rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION).gz
+ @gzip $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar
+
+dist-Z: dist
+ -@rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION).Z
+ @compress -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar
+