mirror of
https://github.com/moparisthebest/pacman
synced 2024-10-31 15:45:03 -04:00
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>
This commit is contained in:
parent
3ba5391839
commit
8741551dc9
@ -335,6 +335,7 @@ AM_CONDITIONAL(USE_GIT_VERSION, test "x$usegitver" = "xyes")
|
|||||||
|
|
||||||
# Set root directory
|
# Set root directory
|
||||||
AC_SUBST(ROOTDIR)
|
AC_SUBST(ROOTDIR)
|
||||||
|
AC_DEFINE_UNQUOTED([ROOTDIR], "$ROOTDIR", [The location of the root operating directory])
|
||||||
# Set package file extension
|
# Set package file extension
|
||||||
AC_SUBST(PKGEXT)
|
AC_SUBST(PKGEXT)
|
||||||
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
|
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
|
||||||
|
@ -11,7 +11,6 @@ bin_PROGRAMS = pacman
|
|||||||
|
|
||||||
DEFS = -DLOCALEDIR=\"@localedir@\" \
|
DEFS = -DLOCALEDIR=\"@localedir@\" \
|
||||||
-DCONFFILE=\"$(conffile)\" \
|
-DCONFFILE=\"$(conffile)\" \
|
||||||
-DROOTDIR=\"$(ROOTDIR)\" \
|
|
||||||
-DDBPATH=\"$(dbpath)\" \
|
-DDBPATH=\"$(dbpath)\" \
|
||||||
-DGPGDIR=\"$(gpgdir)\" \
|
-DGPGDIR=\"$(gpgdir)\" \
|
||||||
-DCACHEDIR=\"$(cachedir)\" \
|
-DCACHEDIR=\"$(cachedir)\" \
|
||||||
|
@ -7,7 +7,6 @@ bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree
|
|||||||
|
|
||||||
DEFS = -DLOCALEDIR=\"@localedir@\" \
|
DEFS = -DLOCALEDIR=\"@localedir@\" \
|
||||||
-DCONFFILE=\"$(conffile)\" \
|
-DCONFFILE=\"$(conffile)\" \
|
||||||
-DROOTDIR=\"$(ROOTDIR)\" \
|
|
||||||
-DDBPATH=\"$(dbpath)\" \
|
-DDBPATH=\"$(dbpath)\" \
|
||||||
-DCACHEDIR=\"$(cachedir)\" \
|
-DCACHEDIR=\"$(cachedir)\" \
|
||||||
@DEFS@
|
@DEFS@
|
||||||
|
Loading…
Reference in New Issue
Block a user