summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Fyfe <andrew@neptune-one.net>2007-05-31 18:13:25 +0200
committerAndrew Fyfe <andrew@neptune-one.net>2007-05-31 18:24:24 +0200
commit139d3c5e99fa6cb28fba7883123891a73fbb2421 (patch)
tree04e97da83022d19c47a10083d1d1af25f2156837
parent7bd2ff685188d0d9b6ab6c6f43f6d28811936881 (diff)
downloadpacman-139d3c5e99fa6cb28fba7883123891a73fbb2421.tar.gz
pacman-139d3c5e99fa6cb28fba7883123891a73fbb2421.tar.xz
Autotool fixes/cleanup.
* configure.ac: Add AC_SUBST() for ROOTDIR, PKGEXT, DBEXT so they get exported to Makefiles. * {makepkg,pacman}.conf.in: Remove extra / from paths. Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
-rw-r--r--configure.ac3
-rw-r--r--etc/makepkg.conf.in2
-rw-r--r--etc/pacman.conf.in12
3 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 834d6191..a03a242a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,11 +189,14 @@ else
fi
# Set root directory
+AC_SUBST(ROOTDIR)
AC_DEFINE_UNQUOTED([ROOTDIR], "$ROOTDIR", [Location of pacman's default root di
rectory])
# Set package file extension
+AC_SUBST(PKGEXT)
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
# Set database file extension
+AC_SUBST(DBEXT)
AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases])
# Configuration files
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index b68b937e..c3ac0f67 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -1,5 +1,5 @@
#
-# /@sysconfdir@/makepkg.conf
+# @sysconfdir@/makepkg.conf
#
#########################################################################
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index ad23e47a..7960b9f3 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -1,5 +1,5 @@
#
-# /@sysconfdir@/pacman.conf
+# @sysconfdir@/pacman.conf
#
# See the pacman manpage for option directives
@@ -20,23 +20,23 @@ HoldPkg = pacman glibc
# have identical names, regardless of version number
#
#[testing]
-#Include = /@sysconfdir@/pacman.d/testing
+#Include = @sysconfdir@/pacman.d/testing
[current]
# Add your preferred servers here, they will be used first
-Include = /@sysconfdir@/pacman.d/current
+Include = @sysconfdir@/pacman.d/current
[extra]
# Add your preferred servers here, they will be used first
-Include = /@sysconfdir@/pacman.d/extra
+Include = @sysconfdir@/pacman.d/extra
[community]
# Add your preferred servers here, they will be used first
-Include = /@sysconfdir@/pacman.d/community
+Include = @sysconfdir@/pacman.d/community
#[unstable]
# Add your preferred servers here, they will be used first
-#Include = /@sysconfdir@/pacman.d/unstable
+#Include = @sysconfdir@/pacman.d/unstable
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.