2005-06-16 David Zeuthen <davidz@redhat.com>

* Makefile.am (dbusservicedir): Adjust to use $(sysconfdir)

        * configure.in: Don't do the DBUS_SYS_DIR thing since it's always
        at $(sysconfdir)/dbus-1/system.d


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@690 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
David Zeuthen 2005-06-16 19:16:09 +00:00
parent ea848843ab
commit 6ea559a44c
4 changed files with 10 additions and 13 deletions

View file

@ -1,3 +1,10 @@
2005-06-16 David Zeuthen <davidz@redhat.com>
* Makefile.am (dbusservicedir): Adjust to use $(sysconfdir)
* configure.in: Don't do the DBUS_SYS_DIR thing since it's always
at $(sysconfdir)/dbus-1/system.d
2005-06-16 David Zeuthen <davidz@redhat.com>
* properties/nm-vpnc.c: Include w_use_domain and w_domain

View file

@ -1,11 +1,11 @@
SUBDIRS = src auth-dialog properties po
dbusservicedir = $(DBUS_SYS_DIR)
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-vpnc-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-vpnc-service.name
EXTRA_DIST = $(dbusservice_DATA) $(nmvpnservice_DATA)
EXTRA_DIST = $(nmvpnservice_DATA) $(dbusservice_DATA)
CLEANFILES = *~

View file

@ -76,16 +76,6 @@ PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS)
AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [where D-BUS system.d directory is]))
if ! test -z "$with_dbus_sys" ; then
DBUS_SYS_DIR="$with_dbus_sys"
else
DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
fi
AC_SUBST(DBUS_SYS_DIR)
AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
AS_AC_EXPAND(DATADIR, $datadir)

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-06-16 14:01-0400\n"
"POT-Creation-Date: 2005-06-16 14:40-0400\n"
"PO-Revision-Date: 2005-06-11 23:21-0400\n"
"Last-Translator: David Zeuthen <davidz@redhat.com>\n"
"Language-Team: Danish <dansk@klid.dk>\n"