[gnome-documents] books: Fix installation on some systems



commit 5ff84586b8c4fa29a8238e706b0b7a145dc4c043
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Dec 8 19:00:22 2015 +0100

    books: Fix installation on some systems
    
    Instead of using symlinks and creating those ourselves in the install
    directory, which creates problems with installing in a different
    location than the prefix, just process 2 versions of the same file,
    through a symlink in the source tree.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=758097

 data/Makefile.am                        |   18 +++++++++---------
 data/org.gnome.Books.data.gresource.xml |    1 +
 2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 85f3ae6..7c4c0a8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,8 +13,13 @@ org.gnome.Documents.data.gresource: org.gnome.Documents.data.gresource.xml $(app
                --target=$@                                             \
                --sourcedir=$(srcdir) $<
 
+org.gnome.Books.data.gresource: org.gnome.Books.data.gresource.xml $(app_resource_files)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES)                           \
+               --target=$@                                             \
+               --sourcedir=$(srcdir) $<
+
 resourcedir = $(pkgdatadir)
-resource_DATA = org.gnome.Documents.data.gresource
+resource_DATA = org.gnome.Documents.data.gresource org.gnome.Books.data.gresource
 
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
@@ -53,18 +58,13 @@ EXTRA_DIST= \
     $(desktop_in_files) \
     $(searchprovider_DATA) \
     $(gsettings_SCHEMAS) \
-    org.gnome.Documents.data.gresource.xml
+    org.gnome.Documents.data.gresource.xml \
+    org.gnome.Books.data.gresource.xml
 
 CLEANFILES = \
     org.gnome.Documents.data.gresource \
+    org.gnome.Books.data.gresource \
     $(appdata_DATA) \
     $(desktop_DATA)
 
-install-exec-hook:
-       -rm -f $(appdir)/org.gnome.Books.data.gresource
-       $(LN_S) $(appdir)/org.gnome.Documents.data.gresource 
$(DESTDIR)$(appdir)/org.gnome.Books.data.gresource
-uninstall-hook:
-       -rm -f $(appdir)/org.gnome.Books.data.gresource
-
-
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.Books.data.gresource.xml b/data/org.gnome.Books.data.gresource.xml
new file mode 120000
index 0000000..0272bb4
--- /dev/null
+++ b/data/org.gnome.Books.data.gresource.xml
@@ -0,0 +1 @@
+org.gnome.Documents.data.gresource.xml
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]