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>

1 files changed, 11 insertions, 10 deletions

diff --git a/scripts/repo-add.in b/scripts/repo-add.in
index fdcc43a9..4dcde346 100644
--- a/scripts/repo-add.in
+++ b/scripts/repo-add.in
@@ -1,22 +1,23 @@
 #!/bin/bash
 #
-#   repo-add : add a package to a given repo database file
-#  
+#   repo-add - add a package to a given repo database file
+#   @configure_input@
+#
 #   Copyright (c) 2006 Aaron Griffin <aaron@archlinux.org>
-#  
+#
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
-# 
+#
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
-#  
+#
 #   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.
 
 myver='@PACKAGE_VERSION@'
@@ -99,7 +100,7 @@ db_write_entry()
 	builddate=""
 	packager=""
 	csize=""
-	size="" 
+	size=""
 	_groups=""
 	_depends=""
 	_backups=""
@@ -138,7 +139,7 @@ db_write_entry()
 	if [ -z "$pkgname" -o -z "$pkgver" ]; then
 		echo "   error: invalid package file"
 		return 1
-	fi 
+	fi
 
 	# remove any other package in the DB with same name
 	for existing in *; do
@@ -237,8 +238,8 @@ if [ $# -lt 2 ]; then
 fi
 
 # source system and user makepkg.conf
-if [ -r @SYSCONFDIR@/makepkg.conf ]; then
-	source @SYSCONFDIR@/makepkg.conf
+if [ -r @sysconfdir@/makepkg.conf ]; then
+	source @sysconfdir@/makepkg.conf
 else
 	echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2
 	exit 1 # $E_CONFIG_ERROR # TODO: error codes