mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-22 15:58:50 -05:00
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:
parent
7bd2ff6851
commit
139d3c5e99
@ -189,11 +189,14 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Set root directory
|
# Set root directory
|
||||||
|
AC_SUBST(ROOTDIR)
|
||||||
AC_DEFINE_UNQUOTED([ROOTDIR], "$ROOTDIR", [Location of pacman's default root di
|
AC_DEFINE_UNQUOTED([ROOTDIR], "$ROOTDIR", [Location of pacman's default root di
|
||||||
rectory])
|
rectory])
|
||||||
# Set package file extension
|
# Set package file extension
|
||||||
|
AC_SUBST(PKGEXT)
|
||||||
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
|
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
|
||||||
# Set database file extension
|
# Set database file extension
|
||||||
|
AC_SUBST(DBEXT)
|
||||||
AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases])
|
AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases])
|
||||||
|
|
||||||
# Configuration files
|
# Configuration files
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# /@sysconfdir@/makepkg.conf
|
# @sysconfdir@/makepkg.conf
|
||||||
#
|
#
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# /@sysconfdir@/pacman.conf
|
# @sysconfdir@/pacman.conf
|
||||||
#
|
#
|
||||||
# See the pacman manpage for option directives
|
# See the pacman manpage for option directives
|
||||||
|
|
||||||
@ -20,23 +20,23 @@ HoldPkg = pacman glibc
|
|||||||
# have identical names, regardless of version number
|
# have identical names, regardless of version number
|
||||||
#
|
#
|
||||||
#[testing]
|
#[testing]
|
||||||
#Include = /@sysconfdir@/pacman.d/testing
|
#Include = @sysconfdir@/pacman.d/testing
|
||||||
|
|
||||||
[current]
|
[current]
|
||||||
# Add your preferred servers here, they will be used first
|
# Add your preferred servers here, they will be used first
|
||||||
Include = /@sysconfdir@/pacman.d/current
|
Include = @sysconfdir@/pacman.d/current
|
||||||
|
|
||||||
[extra]
|
[extra]
|
||||||
# Add your preferred servers here, they will be used first
|
# Add your preferred servers here, they will be used first
|
||||||
Include = /@sysconfdir@/pacman.d/extra
|
Include = @sysconfdir@/pacman.d/extra
|
||||||
|
|
||||||
[community]
|
[community]
|
||||||
# Add your preferred servers here, they will be used first
|
# Add your preferred servers here, they will be used first
|
||||||
Include = /@sysconfdir@/pacman.d/community
|
Include = @sysconfdir@/pacman.d/community
|
||||||
|
|
||||||
#[unstable]
|
#[unstable]
|
||||||
# Add your preferred servers here, they will be used first
|
# 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
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
# tips on creating your own repositories.
|
# tips on creating your own repositories.
|
||||||
|
Loading…
Reference in New Issue
Block a user