diff options
| author | ennael <ennael@mageia.org> | 2013-09-04 21:14:20 +0200 |
|---|---|---|
| committer | ennael <ennael@mageia.org> | 2013-09-04 21:14:20 +0200 |
| commit | 91701094ea146f08753c91c040973ecd1cf2bc3e (patch) | |
| tree | 86374188cc012767bfbeb5df5895990db348ad41 /perl-install/Makefile | |
| parent | 90a211849bad01493dce7875c901205a41023486 (diff) | |
| parent | b7c974efeded487957f7731633cfded9c633f556 (diff) | |
| download | drakx-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/Makefile')
| -rw-r--r-- | perl-install/Makefile | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index f83ceaadb..55871dbe0 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -53,33 +53,18 @@ install_pms stage2 full_stage2: mo_files : $(MOFILES) # rules to build tarball -dist-svn: +dist: tar + +tar: clean + rm -rf $(PACKAGE)*.tar* $(PACKAGE)-$(PKGVERSION) mkdir -p $(PACKAGE)-$(PKGVERSION)/tools - svn export -q -rBASE . $(PACKAGE)-$(PKGVERSION)/perl-install - for i in $(OTHERS); do svn export -q ../$$i $(PACKAGE)-$(PKGVERSION)/$$i; done + (cd ..; git archive HEAD perl-install/{[^i]*,int*} $(OTHERS) kernel/list_modules.pm Makefile.config) | tar xC $(PACKAGE)-$(PKGVERSION) rm -rf $(PACKAGE)-$(PKGVERSION)/perl-install/{install,unused,list_modules.pm} cp -f ../kernel/list_modules.pm $(PACKAGE)-$(PKGVERSION)/perl-install cd $(PACKAGE)-$(PKGVERSION)/perl-install ; mv -f Makefile.drakxtools Makefile @make nuke_perl tar cfa $(PACKAGE)-$(PKGVERSION).tar.xz $(PACKAGE)-$(PKGVERSION) rm -rf $(PACKAGE)-$(PKGVERSION) - -dist-git: - @cd ..; git archive --prefix=$(PACKAGE)-$(PKGVERSION)/ HEAD perl-install/{[^i]*,int*} $(OTHERS) kernel/list_modules.pm Makefile.config | xz >$(PACKAGE)-$(PKGVERSION).tar.xz; - @echo "WARNING: this archive is not complete !!! Regenerate it from SVN" - -dist: tar - -tar: clean - rm -rf $(PACKAGE)*.tar* $(PACKAGE)-$(PKGVERSION) - @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; $(info $(PACKAGE)-$(PKGVERSION).tar.xz is ready) # rules to build a distributable rpm |