mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Use sysconfdir variable if was given via '--sysconfdir' flag to configure script.

Browse Source
This commit is contained in:
Sanel Zukan 2010-01-19 14:41:51 +00:00
parent bb1f7cf95e
commit 7b97a3ccd4
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -28,7 +28,6 @@ else
fi fi
AC_DEFINE_UNQUOTED(PREFIX, "$EDE_INSTALL_DIR", [Default installation place]) AC_DEFINE_UNQUOTED(PREFIX, "$EDE_INSTALL_DIR", [Default installation place])
EDE_OPTIM_FLAGS="" EDE_OPTIM_FLAGS=""
EDE_DEBUG_FLAGS="" EDE_DEBUG_FLAGS=""
@ -242,6 +241,9 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
dnl expand variables before EDE_INIT_JAM convert them to jam variables
EDE_EXPAND(sysconfdir, "NONE", my_sysconfdir)
EDE_INIT_JAM EDE_INIT_JAM
AC_SUBST(EDE_VERSION) AC_SUBST(EDE_VERSION)
@ -258,6 +260,7 @@ AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS) AC_SUBST(CURL_LIBS)
AC_SUBST(LARGEFILE) AC_SUBST(LARGEFILE)
AC_SUBST(XKB_LIBS) AC_SUBST(XKB_LIBS)
AC_SUBST(my_sysconfdir)
AC_OUTPUT([ AC_OUTPUT([
Jamconfig Jamconfig

3
data/startede.in
View File

@ -14,6 +14,7 @@
# http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html # http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
PREFIX="@prefix@" PREFIX="@prefix@"
SYSCONFDIR="@my_sysconfdir@"
if [ "x$XDG_DATA_HOME" = "x" ]; then if [ "x$XDG_DATA_HOME" = "x" ]; then
XDG_DATA_HOME="$HOME/.local/share" XDG_DATA_HOME="$HOME/.local/share"
@ -32,7 +33,7 @@ if [ "x$XDG_DATA_DIRS" = "x" ]; then
fi fi
if [ "x$XDG_CONFIG_DIRS" = "x" ]; then if [ "x$XDG_CONFIG_DIRS" = "x" ]; then
XDG_CONFIG_DIRS="$PREFIX/etc/xdg" XDG_CONFIG_DIRS="$SYSCONFDIR/xdg"
fi fi
# prefix for applications.menu # prefix for applications.menu

12
m4/expand.m4 Normal file
View File

@ -0,0 +1,12 @@
dnl
dnl found in https://jim.sh/svn/jim/vendor/sdcc/2.5.0/configure.in
dnl Examples: AC_EXPAND(prefix, "/usr/local", expanded_prefix)
AC_DEFUN([EDE_EXPAND], [
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
ac_expand=[$]$1
test "x$ac_expand" = xNONE && ac_expand="[$]$2"
ac_expand=`eval echo [$]ac_expand`
$3=`eval echo [$]ac_expand`
])