diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 2008-01-30 14:33:21 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 2008-01-30 14:33:21 +0000 |
| commit | c80213e5f44f7fce1ab28a482cc0ed5982ce0f8d (patch) | |
| tree | 08d23acfa0a3ae9965e184f5351a4bb5fc44e6fe /Makefile.devel | |
| parent | 0ed5a86f529fca32ee0b377e62057836304432be (diff) | |
Remove zip from distribution, only use tgz
Diffstat (limited to 'Makefile.devel')
| -rw-r--r-- | Makefile.devel | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Makefile.devel b/Makefile.devel index d76a19c8..f82fe91f 100644 --- a/Makefile.devel +++ b/Makefile.devel @@ -193,8 +193,7 @@ RPMBUILD=rpmbuild --define '_topdir $(RPMTOPDIR)' # Temporary dmg root for building Mac OS X 10.4 disk image files. DMGTOPDIR=/tmp/$(NAME)-dmg -RELEASENAMETAR = $(RELEASENAME).tar -RELEASENAMETARGZ = $(RELEASENAMETAR).gz +RELEASENAMETGZ = $(RELEASENAME).tgz RELEASENAMEZIP = $(RELEASENAME).zip # What the RPM should be called. RELEASENAMERPM = $(RELEASENAME)-1.noarch.rpm @@ -402,12 +401,7 @@ dist: -(cd $(DISTBUILDIR); ls $(IGNOREDFILES) > ignoredfiles; echo ignoredfiles >> ignoredfiles) # link the long name to short name for convenience of user (cd $(DISTBUILDIR); ln -sf $(RELEASENAME) $(NAME)) - $(TAR) cvzf $(DISTBUILDIR)/$(RELEASENAMETARGZ) --directory $(DISTBUILDIR) --exclude-from $(DISTBUILDIR)/ignoredfiles $(RELEASENAME) $(NAME) - @echo "*************************************************" - @echo " Making zip file..." - @echo "*************************************************" - (cd $(DISTBUILDIR); for f in $(IGNOREDFILES); do echo $$f >> ignoredfiles; done) - (cd $(DISTBUILDIR); $(ZIP) -r $(RELEASENAMEZIP) $(RELEASENAME) -x@ignoredfiles) + $(TAR) cvzf $(DISTBUILDIR)/$(RELEASENAMETGZ) --directory $(DISTBUILDIR) --exclude-from $(DISTBUILDIR)/ignoredfiles $(RELEASENAME) $(NAME) # remove temporary files made for tar/zip only (cd $(DISTBUILDIR); rm -f ignoredfiles $(NAME)) @echo "*************************************************" @@ -436,7 +430,7 @@ release: distclean tag dist # Otherwise cp tries to make hard link instead of symlink?! cp -pfdR $(DISTBUILDIR)/* $(RELEASEDIR) (cd $(RELEASEDIR); rm -f $(LATESTNAME); ln -s $(RELEASENAME) $(LATESTNAME)) - (cd $(RELEASEDIR); ln -sf $(RELEASENAMETARGZ) $(LATESTNAME).tar.gz) + (cd $(RELEASEDIR); ln -sf $(RELEASENAMETGZ) $(LATESTNAME).tar.gz) (cd $(RELEASEDIR); ln -sf $(RELEASENAMEZIP) $(LATESTNAME).zip) (cd $(RELEASEDIR); ln -sf $(RELEASENAME)-1.noarch.rpm $(LATESTNAME).noarch.rpm) (cd $(RELEASEDIR); echo $(PRERELEASE_TAG) > $(PREREL_TAG_FILE)) @@ -458,7 +452,7 @@ rpm: mkdir -p $(RPMTOPDIR)/SPECS mkdir -p $(RPMTOPDIR)/SOURCES mkdir -p $(RPMTOPDIR)/BUILD - $(RPMBUILD) -tb $(DISTBUILDIR)/$(RELEASENAMETARGZ) + $(RPMBUILD) -tb $(DISTBUILDIR)/$(RELEASENAMETGZ) ############################################################ ## @@ -481,7 +475,7 @@ dmg: mkdir -p $(RPMTOPDIR)/SPECS mkdir -p $(RPMTOPDIR)/SOURCES mkdir -p $(RPMTOPDIR)/BUILD - $(RPMBUILD) -tb $(DISTBUILDIR)/$(RELEASENAMETARGZ) + $(RPMBUILD) -tb $(DISTBUILDIR)/$(RELEASENAMETGZ) ############################################################ ## @@ -548,7 +542,7 @@ distinstall: rm -rf $(DISTINSTALLDIR)/$(NAME) mkdir -p $(DISTINSTALLDIR) (cd $(DISTINSTALLDIR); \ - $(TAR) -xpzf $(DISTBUILDIR)/$(RELEASENAMETARGZ); \ + $(TAR) -xpzf $(DISTBUILDIR)/$(RELEASENAMETGZ); \ mv $(RELEASENAME) $(NAME)) ############################################################ |