summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-12-31 18:03:48 +0100
committerAurelien Foret <aurelien@archlinux.org>2005-12-31 18:03:48 +0100
commit289b75d576430489815fae564e4d9086ff270cb2 (patch)
treed0e76c7696502e5c52a1aafed674d3062d1cd57e
parent0fe69d030b1414ed8cbf4f298a313ebd557a0634 (diff)
downloadpacman-289b75d576430489815fae564e4d9086ff270cb2.tar.gz
pacman-289b75d576430489815fae564e4d9086ff270cb2.tar.xz
used defines from alpm.h instead of local ones (patch from VMiklos <vmiklos@frugalware.org>)
-rw-r--r--src/pacman/pacman.c6
-rw-r--r--src/pacman/pacman.h3
2 files changed, 3 insertions, 6 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index b6ab6140..3f085a8b 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
}
if(config->root == NULL) {
- config->root = strdup(PACROOT);
+ config->root = strdup(PM_ROOT);
}
/* add a trailing '/' if there isn't one */
@@ -148,10 +148,10 @@ int main(int argc, char *argv[])
cleanup(1);
}
if(config->dbpath == NULL) {
- config->dbpath = strdup(PACDB);
+ config->dbpath = strdup(PM_DBPATH);
}
if(config->cachedir == NULL) {
- config->cachedir = strdup(PACCACHE);
+ config->cachedir = strdup(PM_CACHEDIR);
}
/* set library parameters */
diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h
index 61228729..51a25932 100644
--- a/src/pacman/pacman.h
+++ b/src/pacman/pacman.h
@@ -21,9 +21,6 @@
#ifndef _PM_PACMAN_H
#define _PM_PACMAN_H
-#define PACROOT "/"
-#define PACDB "var/lib/pacman"
-#define PACCACHE "var/cache/pacman"
#define PACCONF "/etc/pacman.conf"
/* Operations */