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>
This commit is contained in:
Andrew Fyfe 2007-05-31 17:13:25 +01:00
parent 7bd2ff6851
commit 139d3c5e99
3 changed files with 10 additions and 7 deletions

View File

@ -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

View File

@ -1,5 +1,5 @@
#
# /@sysconfdir@/makepkg.conf
# @sysconfdir@/makepkg.conf
#
#########################################################################

View File

@ -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.