summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-03-16 00:15:09 +0000
committerJabiertxof <jtx@jtx.marker.es>2016-03-16 00:15:09 +0000
commit4917dae51b197a94973aae32ede796289e9f2aac (patch)
tree8ffe8dd926ccb4ffcc553c137092c061a2126f4f /share
parentupdate to trunk (diff)
parentFix broken compile from branding folder (diff)
downloadinkscape-4917dae51b197a94973aae32ede796289e9f2aac.tar.gz
inkscape-4917dae51b197a94973aae32ede796289e9f2aac.zip
update to trunk
(bzr r13645.1.122)
Diffstat (limited to 'share')
-rw-r--r--share/branding/CMakeLists.txt2
-rw-r--r--share/branding/Makefile.am5
2 files changed, 4 insertions, 3 deletions
diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt
index ff12059ca..11f772204 100644
--- a/share/branding/CMakeLists.txt
+++ b/share/branding/CMakeLists.txt
@@ -1,2 +1,2 @@
-file(GLOB _FILES "README" "*.svg")
+file(GLOB _FILES "README" "*.svg" "*.ttf")
install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding)
diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am
index f992c8165..d47f206d6 100644
--- a/share/branding/Makefile.am
+++ b/share/branding/Makefile.am
@@ -5,10 +5,11 @@ iconsdir = $(datadir)/inkscape/icons
branding_DATA = \
README \
inkscape.svg \
+ inkscape-flat.svg \
sodipodi.svg \
+ euphoriascript-regular.ttf \
tux.svg \
- draw-freely.svg \
- draw-freely.ru.svg
+ draw-freely.svg
icons_DATA = \
inkscape.svg