summaryrefslogtreecommitdiff
path: root/scripts/makepkg.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-05-30 11:04:49 -0400
committerDan McGee <dan@archlinux.org>2007-05-30 11:04:49 -0400
commitb6387b954f7c35d0d51978aac24ca6bd6a5308fc (patch)
treea6beb14f4280b848fafc00059c7c4a54df2db8f2 /scripts/makepkg.in
parentdd926c7a1c23eab0db242184c7668f32fd4defee (diff)
downloadpacman-b6387b954f7c35d0d51978aac24ca6bd6a5308fc.tar.xz
scripts: do autoconf path replacement right
This should finally get the path replacement in our scripts right. This is the way the autoconf package itself does it and should not need much further tweaking. Threw in a few trailing whitespace corrections from the scripts as well. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.in')
-rw-r--r--scripts/makepkg.in21
1 files changed, 11 insertions, 10 deletions
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index 278050d7..da852b33 100644
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -1,8 +1,9 @@
#!/bin/bash
#
# makepkg - make packages compatable for use with pacman
+# @configure_input@
#
-# Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
+# Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
# Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
# Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
# Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -21,7 +22,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
# USA.
#
@@ -30,7 +31,7 @@ source gettext.sh
TEXTDOMAIN=makepkg
export TEXTDOMAIN
-TEXTDOMAINDIR='@LOCALEDIR@'
+TEXTDOMAINDIR='@localedir@'
export TEXTDOMAINDIR
myver='@PACKAGE_VERSION@'
@@ -38,14 +39,14 @@ startdir=$(pwd)
# Only use ABSROOT if we haven't been passed a SRCROOT on the command line.
if [ -z "$SRCROOT" ]; then
- if [ -r @SYSCONFDIR@/abs/abs.conf ]; then
- source @SYSCONFDIR@/abs/abs.conf
+ if [ -r @sysconfdir@/abs/abs.conf ]; then
+ source @sysconfdir@/abs/abs.conf
fi
if [ -r ~/.abs.conf ]; then
source ~/.abs.conf
fi
SRCROOT=$ABSROOT
-fi
+fi
# Options
ASROOT=0
@@ -649,8 +650,8 @@ _PKGDEST=${PKGDEST}
_SRCDEST=${SRCDEST}
# Source makepkg.conf; fail if it is not found
-if [ -r @SYSCONFDIR@/makepkg.conf ]; then
- source @SYSCONFDIR@/makepkg.conf
+if [ -r @sysconfdir@/makepkg.conf ]; then
+ source @sysconfdir@/makepkg.conf
else
error "$(gettext "/etc/makepkg.conf not found. cannot continue")"
exit 1 # $E_CONFIG_ERROR # TODO: error codes
@@ -1024,7 +1025,7 @@ else
fi
done
#Validate integrity checks
- else
+ else
integrity_sums=($(eval echo \${${integrity_name}s[@]}))
if [ ${#integrity_sums[@]} -eq ${#source[@]} ]; then
@@ -1103,7 +1104,7 @@ else
fi
fi
done
-
+
if [ "$EUID" = "0" ]; then
# chown all source files to root.root
chown -R root.root "$startdir/src"