summaryrefslogtreecommitdiff
path: root/src/pacman
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-12-14 05:23:08 +0000
committerAaron Griffin <aaron@archlinux.org>2006-12-14 05:23:08 +0000
commitb308f06a3a3d368c38b0d109b7e6c1c639127148 (patch)
treef37ea25991eac1bb7d4232db2973b6b2561843b2 /src/pacman
parentf45b3356f8edcd1c90048d2b59ccb4577d0dcf02 (diff)
* Dan McGee's makepkg updates http://www.archlinux.org/pipermail/pacman-dev/2006-December/000792.html
* configure fixes (CFLAGS) * no-strict-aliasing hacks until full C99 compliance * --with-config-file configure option
Diffstat (limited to 'src/pacman')
-rw-r--r--src/pacman/pacman.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 0f55ec43..8cfe39bb 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -57,8 +57,6 @@
#include "sync.h"
#include "deptest.h"
-#define PACCONF "/etc/pacman.conf"
-
#if defined(__OpenBSD__) || defined(__APPLE__)
#define BSD
#endif
@@ -506,6 +504,7 @@ int main(int argc, char *argv[])
if(config->configfile == NULL) {
config->configfile = strdup(PACCONF);
}
+
if(alpm_parse_config(config->configfile, cb_db_register, "") != 0) {
ERR(NL, _("failed to parse config (%s)\n"), alpm_strerror(pm_errno));
cleanup(1);