diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-04 11:02:28 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-04 11:02:28 +0000 |
| commit | 9c64dadb663eb1c400b3f281ef5943fc163f76be (patch) | |
| tree | d2a3a24ee1d9c6298fb1538e25a0beecbba25170 | |
| parent | update to trunk (diff) | |
| parent | Use srcdir instead of datadir for sourcing wildcards (diff) | |
| download | inkscape-9c64dadb663eb1c400b3f281ef5943fc163f76be.tar.gz inkscape-9c64dadb663eb1c400b3f281ef5943fc163f76be.zip | |
update to trunk
(bzr r11950.1.272)
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | share/extensions/Makefile.am | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index dbffcfbde..0d32691f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1047,7 +1047,6 @@ src/check-header-compile src/debug/makefile src/dialogs/makefile src/display/makefile -src/dom/makefile src/extension/implementation/makefile src/extension/internal/makefile src/extension/makefile diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am index 41ddd576f..2c1e23954 100644 --- a/share/extensions/Makefile.am +++ b/share/extensions/Makefile.am @@ -13,9 +13,7 @@ otherstuffdir = $(datadir)/inkscape/extensions moduledir = $(datadir)/inkscape/extensions -# If you remove an extension from here, either add it to EXTRA_DIST -# below, or remove all mention of it from po/inkscape.pot as well. -module_DATA = $(wildcard $(extensiondir)/*.py) +extension_SCRIPTS = $(wildcard $(srcdir)/*.py) otherstuff_DATA = \ fontfix.conf \ @@ -30,7 +28,7 @@ otherstuff_DATA = \ svg2xaml.xsl \ xaml2svg.xsl -module_DATA = $(wildcard $(moduledir)/*.inx) +module_DATA = $(wildcard $(srcdir)/*.inx) EXTRA_DIST = \ $(extension_SCRIPTS) $(otherstuff_DATA) $(module_DATA) |