summaryrefslogtreecommitdiffstats
path: root/perl-install/install
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 /perl-install/install
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 'perl-install/install')
-rw-r--r--perl-install/install/Makefile26
-rw-r--r--perl-install/install/help/po/.gitignore1
-rw-r--r--perl-install/install/share/po/.gitignore1
3 files changed, 7 insertions, 21 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index f3a63da8f..cfbd6444a 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -15,29 +15,13 @@ all: xs
clean xs:
make -C .. $@
-dist-svn:
- mkdir -p $(PRODUCT)-$(VERSION)
- svn export -q -rBASE .. $(PRODUCT)-$(VERSION)/perl-install
- svn export -q -rBASE ../../tools $(PRODUCT)-$(VERSION)/tools
- svn export -q -rBASE ../../kernel $(PRODUCT)-$(VERSION)/kernel
- cp ../../Makefile.config $(PRODUCT)-$(VERSION)/
- tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
- rm -rf $(PRODUCT)-$(VERSION)
-
-dist-git:
- @cd ../..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD kernel perl-install tools Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz;
- @echo WARNING: rpmsrate is MISSING!!!
-
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;
+ mkdir -p $(PRODUCT)-$(VERSION)/perl-install/install/share/
+ (cd ../..; git archive HEAD kernel perl-install tools Makefile.config) | tar xC $(PRODUCT)-$(VERSION)
+ svn export svn://svn.mageia.org/svn/packages/cauldron/meta-task/current/SOURCES $(PRODUCT)-$(VERSION)/perl-install/install/share/meta-task
+ tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
+ rm -rf $(PRODUCT)-$(VERSION)
$(info $(PRODUCT)-$(VERSION).tar.xz is ready)
install:
diff --git a/perl-install/install/help/po/.gitignore b/perl-install/install/help/po/.gitignore
new file mode 100644
index 000000000..cd1f2c943
--- /dev/null
+++ b/perl-install/install/help/po/.gitignore
@@ -0,0 +1 @@
+*.mo
diff --git a/perl-install/install/share/po/.gitignore b/perl-install/install/share/po/.gitignore
new file mode 100644
index 000000000..cd1f2c943
--- /dev/null
+++ b/perl-install/install/share/po/.gitignore
@@ -0,0 +1 @@
+*.mo