mirror of
https://github.com/edeproject/ede.git
synced 2023-08-10 21:13:03 +03:00
Added EDE_CHECK_DIR m4 macro for directory existance checking
Imported services directory with org.equinoxproject.Launch service; directory should be place for all D-BUS services Changed configure.in to find and set D-BUS service directory
This commit is contained in:
parent
c9de60162e
commit
cacf2bb98a
@ -96,9 +96,7 @@ X_LIBS ?= @X_LIBS@ ;
|
||||
X_PRE_LIBS ?= @X_PRE_LIBS@ ;
|
||||
X_EXTRA_LIBS ?= @X_EXTRA_LIBS@ ;
|
||||
|
||||
# directory where D-Bus service files exists; this is mostly default location and if other
|
||||
# place was choosen, /etc/dbus-1/session-local.conf must be updated too
|
||||
DBUS_SERVICE_DIR ?= "/usr/share/dbus-1/services" ;
|
||||
DBUS_SERVICE_DIR ?= @DBUS_SERVICE_DIR@ ;
|
||||
|
||||
# do not touch this
|
||||
JAMCONFIG_READ = "yes" ;
|
||||
|
1
Jamfile
1
Jamfile
@ -36,6 +36,7 @@ SubInclude TOP edewm ;
|
||||
SubInclude TOP evoke ;
|
||||
SubInclude TOP doc ;
|
||||
SubInclude TOP data ;
|
||||
SubInclude TOP services ;
|
||||
|
||||
# efile is not compileable on FreeBSD
|
||||
if $(OS) != FREEBSD {
|
||||
|
@ -165,7 +165,12 @@ fi
|
||||
EDE_CHECK_STATFS
|
||||
EDE_CHECK_STAT64
|
||||
|
||||
EDE_CHECK_DIR(DBUS_SERVICE_DIR, [/usr/share/dbus-1/services /usr/local/share/dbus-1/services /opt/share/dbus-1/services])
|
||||
|
||||
ac_bindir="$bindir"
|
||||
|
||||
EDE_INIT_JAM
|
||||
bindir="$ac_bindir"
|
||||
|
||||
AC_SUBST(EDE_VERSION)
|
||||
AC_SUBST(EDE_OPTIM_FLAGS)
|
||||
@ -181,6 +186,7 @@ AC_OUTPUT([
|
||||
Jamconfig
|
||||
tools/l10n-prepare.sh
|
||||
data/startede
|
||||
services/org.equinoxproject.Launch.service
|
||||
])
|
||||
|
||||
chmod +x tools/l10n-prepare.sh
|
||||
|
31
m4/checkdir.m4
Normal file
31
m4/checkdir.m4
Normal file
@ -0,0 +1,31 @@
|
||||
dnl
|
||||
dnl $Id$
|
||||
dnl
|
||||
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
dnl
|
||||
dnl This program is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
dnl PARTICULAR PURPOSE.
|
||||
|
||||
dnl EDE_CHECK_DIR(VARIABLE, DIRECTORY_LIST)
|
||||
AC_DEFUN(EDE_CHECK_DIR,
|
||||
[AC_MSG_CHECKING(which directory to use for $1)
|
||||
AC_CACHE_VAL(ac_cv_dir_$1,
|
||||
[for ac_var in $2; do
|
||||
if test -d $ac_var; then
|
||||
ac_cv_dir_$1="$ac_var"
|
||||
break
|
||||
fi
|
||||
done
|
||||
])
|
||||
|
||||
$1="$ac_cv_dir_$1"
|
||||
|
||||
AC_SUBST($1)
|
||||
AC_MSG_RESULT($ac_cv_dir_$1)
|
||||
])
|
||||
|
14
services/Jamfile
Normal file
14
services/Jamfile
Normal file
@ -0,0 +1,14 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
# Part of Equinox Desktop Environment (EDE).
|
||||
# Copyright (c) 2009 EDE Authors.
|
||||
#
|
||||
# This program is licensed under terms of the
|
||||
# GNU General Public License version 2 or newer.
|
||||
# See COPYING for details.
|
||||
|
||||
SubDir TOP services ;
|
||||
|
||||
InstallDbusService org.equinoxproject.Launch.service ;
|
||||
Clean distclean : org.equinoxproject.Launch.service ;
|
3
services/org.equinoxproject.Launch.service.in
Normal file
3
services/org.equinoxproject.Launch.service.in
Normal file
@ -0,0 +1,3 @@
|
||||
[D-BUS Service]
|
||||
Name = org.equinoxproject.Launch
|
||||
Exec = @bindir@/ede-launch
|
Loading…
Reference in New Issue
Block a user