summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-02-11 06:16:40 +0100
committerDan McGee <dan@archlinux.org>2012-02-13 17:02:50 +0100
commit8741551dc94d506df72b5ae8453bca1e4d50dbab (patch)
treeb82a0f588672151330e7e66d6fe638318127b305
parent3ba5391839b34823e97574cba2952d732c2729e0 (diff)
downloadpacman-8741551dc94d506df72b5ae8453bca1e4d50dbab.tar.gz
pacman-8741551dc94d506df72b5ae8453bca1e4d50dbab.tar.xz
Move ROOTDIR definition into config.h
This was the only variable of its kind when a define was done on the compiler command line. Move it into config.h instead. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--configure.ac1
-rw-r--r--src/pacman/Makefile.am1
-rw-r--r--src/util/Makefile.am1
3 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index a88e5514..385a355a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,7 @@ AM_CONDITIONAL(USE_GIT_VERSION, test "x$usegitver" = "xyes")
# Set root directory
AC_SUBST(ROOTDIR)
+AC_DEFINE_UNQUOTED([ROOTDIR], "$ROOTDIR", [The location of the root operating directory])
# Set package file extension
AC_SUBST(PKGEXT)
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 795b2d1a..9a92fd6b 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -11,7 +11,6 @@ bin_PROGRAMS = pacman
DEFS = -DLOCALEDIR=\"@localedir@\" \
-DCONFFILE=\"$(conffile)\" \
- -DROOTDIR=\"$(ROOTDIR)\" \
-DDBPATH=\"$(dbpath)\" \
-DGPGDIR=\"$(gpgdir)\" \
-DCACHEDIR=\"$(cachedir)\" \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 2110781b..590bb3d2 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -7,7 +7,6 @@ bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree
DEFS = -DLOCALEDIR=\"@localedir@\" \
-DCONFFILE=\"$(conffile)\" \
- -DROOTDIR=\"$(ROOTDIR)\" \
-DDBPATH=\"$(dbpath)\" \
-DCACHEDIR=\"$(cachedir)\" \
@DEFS@