FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 02-11-2012, 04:19 AM
Allan McRae
 
Default 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>
---
configure.ac | 1 +
src/pacman/Makefile.am | 1 -
src/util/Makefile.am | 1 -
3 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a88e551..385a355 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 795b2d1..9a92fd6 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 2110781..590bb3d 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@
--
1.7.9
 

Thread Tools




All times are GMT. The time now is 02:39 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org