use $(CVS) instead of hardcoded cvs generate .xz instead of .bz2 tarballs
This commit is contained in:
parent
95227b8b1f
commit
d5e872f115
9
Makefile
9
Makefile
@ -1,9 +1,10 @@
|
|||||||
# Makefile for source rpm: clamav
|
# Makefile for source rpm: clamav
|
||||||
NAME := clamav
|
NAME := clamav
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
SPECFILE = $(firstword $(wildcard *.spec))
|
||||||
|
CVS ?= cvs
|
||||||
|
|
||||||
define find-makefile-common
|
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
|
endef
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||||
@ -11,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|||||||
ifeq ($(MAKEFILE_COMMON),)
|
ifeq ($(MAKEFILE_COMMON),)
|
||||||
# attept a checkout
|
# attept a checkout
|
||||||
define checkout-makefile-common
|
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
|
endef
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
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
|
# can not use final tarball name here as it will conflict with rules
|
||||||
# within Makefile.common
|
# within Makefile.common
|
||||||
TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp
|
TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.xz.tmp
|
||||||
TARBALL = ${NAME}-${VERSION}.tar.gz
|
TARBALL = ${NAME}-${VERSION}.tar.gz
|
||||||
|
|
||||||
clean-sources: ${TARBALL_CLEAN}
|
clean-sources: ${TARBALL_CLEAN}
|
||||||
|
|
||||||
${TARBALL_CLEAN}: ${TARBALL}
|
${TARBALL_CLEAN}: ${TARBALL}
|
||||||
rm -f $@.tmp
|
rm -f $@.tmp
|
||||||
zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp
|
zcat $< | tar --delete -f - '*/libclamunrar/*' | xz -c > $@.tmp
|
||||||
mv $@.tmp $@
|
mv $@.tmp $@
|
||||||
|
Loading…
Reference in New Issue
Block a user