SVN: license-installer/license-installer.sh

[pawelz]

Author: pawelz
Date: Sun Apr  4 18:32:08 2010
New Revision: 11298

Modified:
   license-installer/license-installer.sh
Log:
- fixed for new builder/macros


Modified: license-installer/license-installer.sh
==============================================================================
--- license-installer/license-installer.sh	(original)
+++ license-installer/license-installer.sh	Sun Apr  4 18:32:08 2010
@@ -1,10 +1,11 @@
 #!/bin/sh
 if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then
 	tmp=$(mktemp -d)
-	SRPMDIR=`rpm --define "_topdir $tmp" --eval "%{_srcrpmdir}"`
-	BUILDDIR=`rpm --define "_topdir $tmp" --eval "%{_builddir}"`
-	RPMDIR=`rpm --define "_topdir $tmp" --eval "%{_rpmdir}"`
-	PACKAGEDIR="$tmp/packages/@BASE_NAME@"
+	TOPDIR=$tmp/packages
+	SRPMDIR=`rpm --define "_topdir $TOPDIR" --eval "%{_srcrpmdir}"`
+	BUILDDIR=`rpm --define "_topdir $TOPDIR" --eval "%{_builddir}"`
+	RPMDIR=`rpm --define "_topdir $TOPDIR" --eval "%{_rpmdir}"`
+	PACKAGEDIR="$TOPDIR/@BASE_NAME@"
 	mkdir -p $SRPMDIR $RPMDIR $BUILDDIR $PACKAGEDIR
 
 	if echo "$3" | grep '\.src\.rpm$' >/dev/null; then
@@ -33,7 +34,7 @@
 	if [ '@USE_DISTFILES@' = 'no' ]; then
 		nd=-nd
 	fi
-	/usr/bin/builder --define _topdir $tmp --define _binary_payload w1.gzdio $nd -nm -nc -ncs --with license_agreement --target @TARGET_CPU@ @BASE_NAME at .spec
+	/usr/bin/builder --define _topdir $TOPDIR --define _binary_payload w1.gzdio $nd -nm -nc -ncs --with license_agreement --target @TARGET_CPU@ @BASE_NAME at .spec
 	if [ "$?" -ne 0 ]; then
 		exit 2
 	fi