[Bf-blender-cvs] [6b1638c] blender-v2.74-release: tweaks to packman build

[Campbell Barton]

Commit: 6b1638cf790967843bdcce05089bdc30ef481971
Author: Campbell Barton
Date:   Tue Mar 24 06:49:44 2015 +1100
Branches: blender-v2.74-release
https://developer.blender.org/rB6b1638cf790967843bdcce05089bdc30ef481971

tweaks to packman build

remove --asroot arg to makepkg

===================================================================

M	GNUmakefile
M	build_files/package_spec/pacman/PKGBUILD

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index 775d0ae..2f983be 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -171,7 +171,7 @@ help: FORCE
 	@echo ""
 	@echo "Package Targets"
 	@echo "  * package_debian  - build a debian package"
-	@echo "  * package_pacman  - build an arch linux pacmanpackage"
+	@echo "  * package_pacman  - build an arch linux pacman package"
 	@echo "  * package_archive - build an archive package"
 	@echo ""
 	@echo "Testing Targets (not associated with building blender)"
@@ -218,7 +218,7 @@ package_debian: FORCE
 	cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
 
 package_pacman: FORCE
-	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
+	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg
 
 package_archive: FORCE
 	make -C "$(BUILD_DIR)" -s package_archive
diff --git a/build_files/package_spec/pacman/PKGBUILD b/build_files/package_spec/pacman/PKGBUILD
index cc5198a..961e355 100644
--- a/build_files/package_spec/pacman/PKGBUILD
+++ b/build_files/package_spec/pacman/PKGBUILD
@@ -12,9 +12,9 @@ blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blen
 # map the version a -> 1
 # not to be confused with blender's internal subversions
 if [ "$blender_version_char" ]; then
-    blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
+  blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
 else
-	blender_version_full=${blender_version}
+  blender_version_full=${blender_version}
 fi
 
 blender_ver_string=$blender_version+git$blender_version_full
@@ -60,7 +60,7 @@ package() {
   cd $srcdir/build
   make DESTDIR="$pkgdir" install
   python -m compileall \
-	$pkgdir/usr/share/blender/$blender_version/scripts/startup \
-	$pkgdir/usr/share/blender/$blender_version/scripts/modules \
-	$pkgdir/usr/share/blender/$blender_version/scripts/addons
+  $pkgdir/usr/share/blender/$blender_version/scripts/startup \
+  $pkgdir/usr/share/blender/$blender_version/scripts/modules \
+  $pkgdir/usr/share/blender/$blender_version/scripts/addons
 }