aboutsummaryrefslogtreecommitdiff
path: root/distrib/Makefile
diff options
context:
space:
mode:
authorherbelin2000-12-27 17:51:29 +0000
committerherbelin2000-12-27 17:51:29 +0000
commit50457d3bf6aee2a49dd9c0acf7389b885178ea3f (patch)
treead2ffda7f4fc17d01c84d28fff54a25ce7650f49 /distrib/Makefile
parentba232d00408519083cf45992c06e71eae1c99310 (diff)
Améliorations
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@1230 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'distrib/Makefile')
-rw-r--r--distrib/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/distrib/Makefile b/distrib/Makefile
index 7e1e69221a..cc46418c66 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -160,20 +160,25 @@ ${COQRPMPACKAGE}.src.rpm: ${COQPACKAGE}.tar.gz
cp -f petit-coq.gif ${RPMTOPDIR}/SOURCES
cp -f ${COQPACKAGE}.tar.gz ${RPMTOPDIR}/SOURCES
- mkdir ${RPMTOPDIR}/RPMS/${ARCH}
+ - rm ${RPMTOPDIR}/RPMS/${LOCALARCH}
- ln -s ${RPMTOPDIR}/RPMS/${ARCH} ${RPMTOPDIR}/RPMS/${LOCALARCH}
${RPM} -ba coq.spec
mv ${RPMTOPDIR}/SRPMS/${COQRPMPACKAGE}.src.rpm .
(if [ -f ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${LOCALARCH}.rpm ];\
- then mv ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${LOCALARCH}.rpm ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${ARCH}.rpm;
+ then mv ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${LOCALARCH}.rpm ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${ARCH}.rpm;\
+ else mv ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${ARCH}.rpm .;\
fi)
- - mv ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${ARCH}.rpm .
# Sera déjà fait si le src.rpm vient d'être fait
${COQRPMPACKAGE}.${ARCH}.rpm: rpm-config ${COQRPMPACKAGE}.src.rpm
- mkdir ${RPMTOPDIR}/RPMS/${ARCH}
+ - rm ${RPMTOPDIR}/RPMS/${LOCALARCH}
- ln -s ${RPMTOPDIR}/RPMS/${ARCH} ${RPMTOPDIR}/RPMS/${LOCALARCH}
${RPM} --rebuild ${COQRPMPACKAGE}.src.rpm
- mv ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${ARCH}.rpm .
+ (if [ -f ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${LOCALARCH}.rpm ];\
+ then mv ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${LOCALARCH}.rpm ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${ARCH}.rpm;\
+ else mv ${RPMTOPDIR}/RPMS/${ARCH}/${COQRPMPACKAGE}.${ARCH}.rpm .;\
+ fi)
##########
contrib-tag: