diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-23 22:49:44 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-24 17:47:50 +0300 |
| commit | 6b1638cf790967843bdcce05089bdc30ef481971 (patch) | |
| tree | 4070c794fd32922d952e2b515a67d1b1a9aabad0 | |
| parent | 07e815df4bd4ad28065f19d7025623f9fc53faed (diff) | |
tweaks to packman build
remove --asroot arg to makepkg
| -rw-r--r-- | GNUmakefile | 4 | ||||
| -rw-r--r-- | build_files/package_spec/pacman/PKGBUILD | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index 775d0ae532b..2f983be3f2a 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 cc5198a88e3..961e35578b9 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 } |