rpms
/
clamav
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use $(CVS) instead of hardcoded cvs generate .xz instead of .bz2 tarballs

This commit is contained in:
ensc 2010-03-11 12:11:57 +00:00
parent 95227b8b1f
commit d5e872f115
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,9 +1,10 @@
# Makefile for source rpm: clamav
NAME := clamav
SPECFILE = $(firstword $(wildcard *.spec))
CVS ?= cvs
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
@ -11,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
test -f CVS/Root && { $(CVS) -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
@ -22,12 +23,12 @@ include $(MAKEFILE_COMMON)
# can not use final tarball name here as it will conflict with rules
# within Makefile.common
TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp
TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.xz.tmp
TARBALL = ${NAME}-${VERSION}.tar.gz
clean-sources: ${TARBALL_CLEAN}
${TARBALL_CLEAN}: ${TARBALL}
rm -f $@.tmp
zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp
zcat $< | tar --delete -f - '*/libclamunrar/*' | xz -c > $@.tmp
mv $@.tmp $@