summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-25 14:57:55 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-25 14:57:55 +0000
commit2e93aff9d0bf2d21b2e197e941170904ee9445da (patch)
tree6dd982707ce71b46491b780e25cfb5d4d02f3afd
parent3af352deed789ea74d1f99d8ddb369514a8b4a4c (diff)
downloaddrakx-2e93aff9d0bf2d21b2e197e941170904ee9445da.tar
drakx-2e93aff9d0bf2d21b2e197e941170904ee9445da.tar.gz
drakx-2e93aff9d0bf2d21b2e197e941170904ee9445da.tar.bz2
drakx-2e93aff9d0bf2d21b2e197e941170904ee9445da.tar.xz
drakx-2e93aff9d0bf2d21b2e197e941170904ee9445da.zip
use spec_test rather than test
-rw-r--r--perl-install/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 64220572d..714002815 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -1,6 +1,6 @@
PACKAGE=drakxtools
PKGVERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec|head -1)
-RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec|head -)
+RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec|head -1)
TAG := $(shell echo "V$(PKGVERSION)_$(RELEASE)" | tr -- '-.' '__')
include Makefile.config
@@ -206,9 +206,8 @@ cleandist:
rm -rf ../$(PACKAGE)-$(PKGVERSION) ../$(PACKAGE)-$(PKGVERSION).tar.bz2
spec_test:
- @if [[ -z "$(PRELEASE)" ]]; then echo "unable to get spec release"; exit 2;fi
@if [[ -z "$(PKGVERSION)" ]]; then echo "unable to get spec version"; exit 3;fi
-
+ @if [[ -z "$(RELEASE)" ]]; then echo "unable to get spec release"; exit 2;fi
tar:
cd ../$(PACKAGE)-$(PKGVERSION) && perl -pi -e 's/^C_RPM.*/C_RPM=0/; s/^C_DRAKX.*/C_DRAKX=0/' c/Makefile
@@ -229,7 +228,7 @@ buildsrpm:
rpm: cvstag dist buildrpm
-srpm: test cvstag dist buildsrpm
+srpm: spec_test cvstag dist buildsrpm
dist: cleandist export tar