diff options
| author | David Zeuthen <davidz@redhat.com> | 2009-06-08 14:21:27 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2009-06-08 14:21:27 -0400 |
| commit | e74ca1a5828b155df4fd88212eff904e88659d8a (patch) | |
| tree | a24aeee24e20bf7c467478b42eb76a2ba2bf8aaf | |
| parent | 86e8003484056ce734e45e899ea5f17e144e6d2f (diff) | |
| download | polkit-e74ca1a5828b155df4fd88212eff904e88659d8a.tar.gz | |
Use .../extensions instead of ../backends for loading extensions
| -rw-r--r-- | docs/extensiondir.xml.in | 2 | ||||
| -rw-r--r-- | src/nullbackend/Makefile.am | 12 | ||||
| -rw-r--r-- | src/polkitbackend/Makefile.am | 2 | ||||
| -rw-r--r-- | src/polkitbackend/polkitbackendauthority.c | 4 | ||||
| -rw-r--r-- | src/programs/Makefile.am | 12 |
5 files changed, 16 insertions, 16 deletions
diff --git a/docs/extensiondir.xml.in b/docs/extensiondir.xml.in index c12c3d6..44e242c 100644 --- a/docs/extensiondir.xml.in +++ b/docs/extensiondir.xml.in @@ -1 +1 @@ -@libdir@/polkit-1/backends +@libdir@/polkit-1/extensions diff --git a/src/nullbackend/Makefile.am b/src/nullbackend/Makefile.am index c943da1..82de8ce 100644 --- a/src/nullbackend/Makefile.am +++ b/src/nullbackend/Makefile.am @@ -17,27 +17,27 @@ INCLUDES = \ -D_REENTRANT \ $(NULL) -polkitmodulesdir = $(libdir)/polkit-1/backends -polkitmodules_LTLIBRARIES = libpolkit-nullbackend.la +polkitmodulesdir = $(libdir)/polkit-1/extensions +polkitmodules_LTLIBRARIES = nullbackend.la -libpolkit_nullbackend_la_SOURCES = \ +nullbackend_la_SOURCES = \ nullbackend.c \ polkitbackendnullauthority.c polkitbackendnullauthority.h \ $(NULL) -libpolkit_nullbackend_la_CFLAGS = \ +nullbackend_la_CFLAGS = \ -DPOLKIT_BACKEND_I_KNOW_API_IS_SUBJECT_TO_CHANGE \ -DG_LOG_DOMAIN=\"PolkitNullBackend\" \ $(GLIB_CFLAGS) \ $(NULL) -libpolkit_nullbackend_la_LDFLAGS = \ +nullbackend_la_LDFLAGS = \ $(module_flags) \ $(GLIB_LDADD) \ $(top_builddir)/src/polkitbackend/libpolkit-backend-1.la \ $(NULL) -libpolkit_nullbackend_la_LIBADD = \ +nullbackend_la_LIBADD = \ $(NULL) nullconfigdir = $(sysconfdir)/polkit-1/nullbackend.conf.d diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am index a49e131..b33e33d 100644 --- a/src/polkitbackend/Makefile.am +++ b/src/polkitbackend/Makefile.am @@ -93,4 +93,4 @@ clean-local : install-exec-hook: mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1 -chmod 600 $(DESTDIR)$(localstatedir)/lib/polkit-1 - mkdir -p $(DESTDIR)$(libdir)/polkit-1/backends + mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions diff --git a/src/polkitbackend/polkitbackendauthority.c b/src/polkitbackend/polkitbackendauthority.c index 63f252d..8051ecf 100644 --- a/src/polkitbackend/polkitbackendauthority.c +++ b/src/polkitbackend/polkitbackendauthority.c @@ -1287,7 +1287,7 @@ polkit_backend_register_authority (PolkitBackendAuthority *authority, /** * polkit_backend_authority_get: * - * Loads all #GIOModule<!-- -->s from <literal>$(libdir)/polkit-1/backends</literal> to determine + * Loads all #GIOModule<!-- -->s from <filename>$(libdir)/polkit-1/extensions</filename> to determine * what implementation of #PolkitBackendAuthority to use. Then instantiates an object of the * implementation with the highest priority and unloads all other modules. * @@ -1323,7 +1323,7 @@ polkit_backend_authority_get (void) } /* load all modules */ - modules = g_io_modules_load_all_in_directory (PACKAGE_LIB_DIR "/polkit-1/backends"); + modules = g_io_modules_load_all_in_directory (PACKAGE_LIB_DIR "/polkit-1/extensions"); /* find all extensions; we have at least one here since we've registered the local backend */ authority_implementations = g_io_extension_point_get_extensions (ep); diff --git a/src/programs/Makefile.am b/src/programs/Makefile.am index 1765768..c504889 100644 --- a/src/programs/Makefile.am +++ b/src/programs/Makefile.am @@ -32,25 +32,25 @@ pkexec_LDADD = \ $(top_builddir)/src/polkit/libpolkit-gobject-1.la \ $(NULL) -polkitmodulesdir = $(libdir)/polkit-1/backends -polkitmodules_LTLIBRARIES = libpolkit-pkexec-action-lookup.la +polkitmodulesdir = $(libdir)/polkit-1/extensions +polkitmodules_LTLIBRARIES = pkexec-action-lookup.la -libpolkit_pkexec_action_lookup_la_SOURCES = \ +pkexec_action_lookup_la_SOURCES = \ pkexec-action-lookup.c \ $(NULL) -libpolkit_pkexec_action_lookup_la_CFLAGS = \ +pkexec_action_lookup_la_CFLAGS = \ -DPOLKIT_BACKEND_I_KNOW_API_IS_SUBJECT_TO_CHANGE \ -DG_LOG_DOMAIN=\"pkexec-action-lookup\" \ $(GLIB_CFLAGS) \ $(NULL) -libpolkit_pkexec_action_lookup_la_LDFLAGS = \ +pkexec_action_lookup_la_LDFLAGS = \ -export_dynamic -avoid-version -module -no-undefined \ -export-symbols-regex '^g_io_module_(load|unload)' \ $(NULL) -libpolkit_pkexec_action_lookup_la_LIBADD = \ +pkexec_action_lookup_la_LIBADD = \ $(top_builddir)/src/polkitbackend/libpolkit-backend-1.la \ $(NULL) |