diff options
| author | Wu Xiaotian <[email protected]> | 2019-02-18 14:36:07 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-02-18 09:58:04 +0100 |
| commit | 05e1e93acb86fc0e28f69acfd0cced773b140ff6 (patch) | |
| tree | 07b66842b71ab75c852f13e5f902b4ffbde0547e | |
| parent | 285937d893afae5874c483a59d91e035211a7f56 (diff) | |
| download | caja-dropbox-05e1e93acb86fc0e28f69acfd0cced773b140ff6.tar.bz2 caja-dropbox-05e1e93acb86fc0e28f69acfd0cced773b140ff6.tar.xz | |
Fix distcheck fail
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | docgen.py | 5 | ||||
| -rw-r--r-- | serializeimages.py | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index f2af474..f68b5ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,12 @@ CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py autogen.sh man_MANS = caja-dropbox.1 -caja-dropbox: caja-dropbox.in serializeimages.py - python3 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox +caja-dropbox: $(top_srcdir)/caja-dropbox.in $(top_srcdir)/serializeimages.py + python3 $(top_srcdir)/serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < $(top_srcdir)/caja-dropbox.in > caja-dropbox chmod +x caja-dropbox -caja-dropbox.1: caja-dropbox.txt.in caja-dropbox docgen.py - python3 docgen.py $(PACKAGE_VERSION) caja-dropbox.txt.in caja-dropbox.txt +caja-dropbox.1: $(top_srcdir)/caja-dropbox.txt.in caja-dropbox $(top_srcdir)/docgen.py + python3 $(top_srcdir)/docgen.py $(PACKAGE_VERSION) $(top_srcdir)/caja-dropbox.txt.in caja-dropbox.txt $(RST2MAN) caja-dropbox.txt > caja-dropbox.1 SUBDIRS = data src @@ -1,4 +1,5 @@ from __future__ import unicode_literals +import os import sys import datetime import codecs @@ -8,7 +9,9 @@ env = {"__name__":"__notmain__"} exec(open("caja-dropbox").read(), env) commands = env["commands"] -with codecs.open("AUTHORS", "r", "utf-8") as afile: +selfpath = os.path.abspath(sys.argv[0]) +top_srcdir = os.path.dirname(selfpath) +with codecs.open(os.path.join(top_srcdir, "AUTHORS"), "r", "utf-8") as afile: authors = '| ' + afile.read().replace('\n', '\n| ') with codecs.open(sys.argv[2], "r", encoding="utf-8") as infile: diff --git a/serializeimages.py b/serializeimages.py index 7987ed4..4d20a8d 100644 --- a/serializeimages.py +++ b/serializeimages.py @@ -1,3 +1,4 @@ +import os import sys import gi gi.require_version('GdkPixbuf', '2.0') @@ -13,8 +14,10 @@ def replace_many(src2dest, buf): return src_re.sub(replace_repl, buf) if __name__ == '__main__': - pixbuf64 = GdkPixbuf.Pixbuf.new_from_file("data/icons/hicolor/64x64/apps/caja-dropbox.png") - pixbuf16 = GdkPixbuf.Pixbuf.new_from_file("data/icons/hicolor/16x16/apps/caja-dropbox.png") + selfpath = os.path.abspath(sys.argv[0]) + top_srcdir = os.path.dirname(selfpath) + pixbuf64 = GdkPixbuf.Pixbuf.new_from_file(os.path.join(top_srcdir, "data/icons/hicolor/64x64/apps/caja-dropbox.png")) + pixbuf16 = GdkPixbuf.Pixbuf.new_from_file(os.path.join(top_srcdir, "data/icons/hicolor/16x16/apps/caja-dropbox.png")) src2dest = {'@PACKAGE_VERSION@': sys.argv[1], '@DESKTOP_FILE_DIR@': sys.argv[2], '@IMAGEDATA64@': ("GdkPixbuf.Pixbuf.new_from_data(%r, GdkPixbuf.Colorspace.RGB, %r, %r, %r, %r, %r)" % |