summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorennael <ennael@mageia.org>2013-09-04 21:14:20 +0200
committerennael <ennael@mageia.org>2013-09-04 21:14:20 +0200
commit91701094ea146f08753c91c040973ecd1cf2bc3e (patch)
tree86374188cc012767bfbeb5df5895990db348ad41 /rescue
parent90a211849bad01493dce7875c901205a41023486 (diff)
parentb7c974efeded487957f7731633cfded9c633f556 (diff)
downloaddrakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar
drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar.gz
drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar.bz2
drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar.xz
drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.zip
Merge branch 'master' of git://git.mageia.org/software/drakx
Diffstat (limited to 'rescue')
-rw-r--r--rescue/Makefile21
1 files changed, 1 insertions, 20 deletions
diff --git a/rescue/Makefile b/rescue/Makefile
index e9b620dda..ef01f15de 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -13,30 +13,11 @@ install: $(RESCUE)
$(RESCUE): list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img
DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img
-dist-svn:
- rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- mkdir -p $(PRODUCT)-$(VERSION)/tools
- svn export -q -rBASE . $(PRODUCT)-$(VERSION)/rescue
- cp ../Makefile.config $(PRODUCT)-$(VERSION)/
- cp ../tools/install-xml-file-list $(PRODUCT)-$(VERSION)/tools
- tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
- rm -rf $(PRODUCT)-$(VERSION)
-
-dist-git:
- @cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD rescue tools/install-xml-file-list Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz;
-
dist: tar
tar:
rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- @if [ -e "../.svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e "../.git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
+ @cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD rescue tools/install-xml-file-list Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz;
$(info $(PRODUCT)-$(VERSION).tar.xz is ready)
clean: