maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

syncevolution.org: fix for packaging 

The previous commit broke parallel "make deb" (because mv *.deb
matched different package builds and then mv only succeeded for one)
and "make rpm" (because the mv was looking in the wrong place).
This commit is contained in:
Patrick Ohly 2012-06-15 10:20:46 +00:00
parent 603d036b68
commit 98bd5e2b59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -181,7 +181,7 @@ deb rpm : checkinstall/dist/$(distdir) checkinstall/dist/debian/control
--pkggroup='$*' \
--pkggroup='comm' \
cp -r `pwd`/dist/$(distdir)/* / && \
if [ $@ = "rpm" ]; then cp /usr/src/rpm/RPMS/*/${PKGNAME}-${VERSION}-2.*.rpm ..; else mv *.deb ..; fi
if [ $@ = "rpm" ]; then cp /usr/src/rpm/RPMS/*/${PKGNAME}-${VERSION}-2.*.rpm ..; else mv ${PKGNAME}_${VERSION}*.deb ..; fi
# Pseudo platform .deb packages:
# only depend on PKGNAME = syncevolution-$(BINSUFFIX) (usually syncevolution-bundle).
@ -221,7 +221,7 @@ syncevolution-%-deb: checkinstall/dist/$(distdir) checkinstall/dist/debian/contr
--pkgsource='http://syncevolution.org' \
--pkggroup='$*' \
sh -c 'mkdir -p touch /usr/share/doc/syncevolution-$* && echo "SyncEvolution platform pseudo-package for $*" >/usr/share/doc/syncevolution-$*/README' && \
mv *.deb ..
mv syncevolution-$**.deb ..
all_phonies += checkinstall/dist/$(distdir) clean_dist
checkinstall/dist/$(distdir): all