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 */