diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-03-22 09:31:25 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-03-22 09:31:25 +0000 |
| commit | b94f2de41d44b9e2a54248ac38081d9932956d5c (patch) | |
| tree | b19c20c8579832c33bfd6c8f6e4947f7583fbd79 /Makefile.am | |
| parent | cd2e6946bbd5868fe0cfe894e9fa6f70edfed6cc (diff) | |
| download | libjpeg-turbo-b94f2de41d44b9e2a54248ac38081d9932956d5c.tar.gz | |
Clean up packaging system
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@537 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 3131953c..064114c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -223,11 +223,12 @@ rpm: all TMPDIR=`mktemp -d /tmp/${PACKAGE_NAME}-build.XXXXXX`; \ mkdir -p $$TMPDIR/RPMS; \ ln -fs `pwd` $$TMPDIR/BUILD; \ - rm -f ${PACKAGE_NAME}.${RPMARCH}.rpm; \ + rm -f ${PACKAGE_NAME}-${VERSION}.${RPMARCH}.rpm; \ rpmbuild -bb --define "_blddir $$TMPDIR/buildroot" \ --define "_topdir $$TMPDIR" --define "_srcdir ${srcdir}" \ - --target ${RPMARCH} libjpeg-turbo.spec; \ - cp $$TMPDIR/RPMS/${RPMARCH}/${PACKAGE_NAME}-${VERSION}-${BUILD}.${RPMARCH}.rpm ${PACKAGE_NAME}.${RPMARCH}.rpm; \ + --target ${RPMARCH} pkgscripts/libjpeg-turbo.spec; \ + cp $$TMPDIR/RPMS/${RPMARCH}/${PACKAGE_NAME}-${VERSION}-${BUILD}.${RPMARCH}.rpm \ + ${PACKAGE_NAME}-${VERSION}.${RPMARCH}.rpm; \ rm -rf $$TMPDIR srpm: dist-gzip @@ -237,38 +238,38 @@ srpm: dist-gzip mkdir -p $$TMPDIR/BUILD; \ mkdir -p $$TMPDIR/SOURCES; \ mkdir -p $$TMPDIR/SPECS; \ - rm -f ${PACKAGE_NAME}.src.rpm; \ + rm -f ${PACKAGE_NAME}-${VERSION}.src.rpm; \ cp ${PACKAGE_NAME}-${VERSION}.tar.gz $$TMPDIR/SOURCES; \ - cat libjpeg-turbo.spec | sed s/%{_blddir}/%{_tmppath}/g \ + cat pkgscripts/libjpeg-turbo.spec | sed s/%{_blddir}/%{_tmppath}/g \ | sed s@%{_srcdir}/@@g | sed s/#--\>//g \ - >$$TMPDIR/SPECS/libjpeg-turbo.spec; \ + > $$TMPDIR/SPECS/libjpeg-turbo.spec; \ rpmbuild -bs --define "_topdir $$TMPDIR" $$TMPDIR/SPECS/libjpeg-turbo.spec; \ - cp $$TMPDIR/SRPMS/${PACKAGE_NAME}-${VERSION}-${BUILD}.src.rpm ${PACKAGE_NAME}.src.rpm; \ + cp $$TMPDIR/SRPMS/${PACKAGE_NAME}-${VERSION}-${BUILD}.src.rpm \ + ${PACKAGE_NAME}-${VERSION}.src.rpm; \ rm -rf $$TMPDIR deb: all - sh $(srcdir)/release/makedpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \ - ${DEBARCH} ${srcdir} + sh pkgscripts/makedpkg if X86_64 udmg: all - sh makemacpkg universal ${BUILDDIR32} + sh pkgscripts/makemacpkg universal ${BUILDDIR32} endif dmg: all - sh makemacpkg + sh pkgscripts/makemacpkg if X86_64 csunpkg: all - sh makesunpkg combined ${BUILDDIR32} + sh pkgscripts/makesunpkg combined ${BUILDDIR32} endif sunpkg: all - sh makesunpkg + sh pkgscripts/makesunpkg cygwinpkg: all - sh $(srcdir)/release/makecygwinpkg ${PACKAGE_NAME} ${VERSION} ${srcdir} + sh pkgscripts/makecygwinpkg |