diff options
| author | Stef Walter <stef@memberwebs.com> | 2010-09-12 21:19:52 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2010-09-12 21:19:52 +0000 |
| commit | c7f954aafdc4de66ccf191e72fcd93353047e7f5 (patch) | |
| tree | cb5f679c350f13ab5c829da3c5fba8cbaa1d8b48 /tool | |
| parent | 8ea37e4098fea963e7836f97fb75f4648edaca8a (diff) | |
| parent | 10cfc8e7bf03433fe03206d0f4e330b1deed36cd (diff) | |
| download | gnome-keyring-c7f954aafdc4de66ccf191e72fcd93353047e7f5.tar.gz | |
Merge branch 'master' into gck-work
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/.gitignore | 1 | ||||
| -rw-r--r-- | tool/Makefile.am | 16 |
2 files changed, 12 insertions, 5 deletions
diff --git a/tool/.gitignore b/tool/.gitignore index a264247e..fda5af4e 100644 --- a/tool/.gitignore +++ b/tool/.gitignore @@ -1 +1,2 @@ /gnome-keyring +/gnome-keyring-3 diff --git a/tool/Makefile.am b/tool/Makefile.am index e3252f59..de328b26 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -1,5 +1,5 @@ bin_PROGRAMS= \ - gnome-keyring + gnome-keyring@GCR_VERSION_SUFFIX@ INCLUDES= \ -I$(top_srcdir) \ @@ -8,19 +8,25 @@ INCLUDES= \ $(GOBJECT_CFLAGS) \ $(GLIB_CFLAGS) -gnome_keyring_SOURCES = \ +gnome_keyring@GCR_VERSION_SUFFIX@_SOURCES = \ gkr-tool.c gkr-tool.h \ gkr-tool-import.c -gnome_keyring_CFLAGS = \ +gnome_keyring@GCR_VERSION_SUFFIX@_CFLAGS = \ -DGCR_API_SUBJECT_TO_CHANGE \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -gnome_keyring_LDADD = \ +gnome_keyring@GCR_VERSION_SUFFIX@_LDADD = \ $(top_builddir)/gck/libgck.la \ - $(top_builddir)/gcr/libgcr.la \ + $(top_builddir)/gcr/libgcr@GCR_VERSION_SUFFIX@.la \ $(top_builddir)/egg/libegg.la \ $(GTHREAD_LIBS) \ $(GTK_LIBS) \ $(GCRYPT_LIBS) \ $(DAEMON_LIBS) + +# Install a link from gnome-keyring → gnome-keyring@GCR_VERSION_SUFFIX@ to maintain compatibility +if WITH_GTK3 +install-exec-hook: + @test -e "$(DESTDIR)$(bindir)/gnome-keyring" || (cd $(DESTDIR)$(bindir) && $(LN_S) gnome-keyring@GCR_VERSION_SUFFIX@ gnome-keyring) +endif |