tweaks to packman build
authorCampbell Barton <ideasman42@gmail.com>
Mon, 23 Mar 2015 19:49:44 +0000 (06:49 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 23 Mar 2015 20:49:17 +0000 (07:49 +1100)
remove --asroot arg to makepkg

GNUmakefile
build_files/package_spec/pacman/PKGBUILD

index 5a3a0b7848d1f0e0580fef5ef958f0241d1daaa4..fc1de5e4954129d0b92f6658f0fd259455eb7f05 100644 (file)
@@ -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
index cc5198a88e3954718a2c50f907383e36fc9f68d9..961e35578b94cba20f29f5e065771c12770d7135 100644 (file)
@@ -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
 }