summaryrefslogtreecommitdiff
path: root/scripts/makepkg.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-05-29 17:46:20 -0400
committerDan McGee <dan@archlinux.org>2007-05-29 17:46:20 -0400
commitf3836ff8e8f3dbb25b8b5161a14004a5fc08554a (patch)
treea08ec4e3d94305cdbe6e2e1627780182d6ad0927 /scripts/makepkg.in
parent103c7243a2d50dd46c0b5efefdc2e1b1d24e30e0 (diff)
Set paths in pacman-optimize to use configure-time paths
By setting up a few more AC_SUBST macros in configure.ac, we can fill in paths in the scripts on the fly instead of having them in multiple places. Other small fixes: * Fix an oops on my last commit where I had some lines stil commented. * Fix makepkg bug where the generated package name using PKGEXT had two periods (..). Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.in')
-rw-r--r--scripts/makepkg.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index 2884e5db..0743b8fc 100644
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -578,7 +578,7 @@ create_package() {
# tar it up
msg2 "$(gettext "Compressing package...")"
- local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}"
+ local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
comp_files="$comp_files .PKGINFO .FILELIST"
if ! tar -czf "$pkg_file" $comp_files *; then
@@ -590,11 +590,11 @@ create_package() {
installpackage() {
if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then
msg "$(gettext "Installing package with pacman -U...")"
- sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}
+ sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
exit $?
elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then
msg "$(gettext "Installing package with pacman -U...")"
- pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}
+ pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
exit $?
fi
}
@@ -864,7 +864,7 @@ if [ "$install" -a ! -f "$install" ]; then
exit 1
fi
-if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}" \
+if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
-a "$FORCE" = "0" -a "$GENINTEG" = "0" ]; then
if [ "$INSTALL" = "1" ]; then
warning "$(gettext "a package has already been built, installing existing package.")"