Skip to content

Commit 05e1e93

Browse files
yetistraveit65
authored andcommitted
Fix distcheck fail
1 parent 285937d commit 05e1e93

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt
55
EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py autogen.sh
66
man_MANS = caja-dropbox.1
77

8-
caja-dropbox: caja-dropbox.in serializeimages.py
9-
python3 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox
8+
caja-dropbox: $(top_srcdir)/caja-dropbox.in $(top_srcdir)/serializeimages.py
9+
python3 $(top_srcdir)/serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < $(top_srcdir)/caja-dropbox.in > caja-dropbox
1010
chmod +x caja-dropbox
1111

12-
caja-dropbox.1: caja-dropbox.txt.in caja-dropbox docgen.py
13-
python3 docgen.py $(PACKAGE_VERSION) caja-dropbox.txt.in caja-dropbox.txt
12+
caja-dropbox.1: $(top_srcdir)/caja-dropbox.txt.in caja-dropbox $(top_srcdir)/docgen.py
13+
python3 $(top_srcdir)/docgen.py $(PACKAGE_VERSION) $(top_srcdir)/caja-dropbox.txt.in caja-dropbox.txt
1414
$(RST2MAN) caja-dropbox.txt > caja-dropbox.1
1515

1616
SUBDIRS = data src

docgen.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from __future__ import unicode_literals
2+
import os
23
import sys
34
import datetime
45
import codecs
@@ -8,7 +9,9 @@
89
exec(open("caja-dropbox").read(), env)
910
commands = env["commands"]
1011

11-
with codecs.open("AUTHORS", "r", "utf-8") as afile:
12+
selfpath = os.path.abspath(sys.argv[0])
13+
top_srcdir = os.path.dirname(selfpath)
14+
with codecs.open(os.path.join(top_srcdir, "AUTHORS"), "r", "utf-8") as afile:
1215
authors = '| ' + afile.read().replace('\n', '\n| ')
1316

1417
with codecs.open(sys.argv[2], "r", encoding="utf-8") as infile:

serializeimages.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import os
12
import sys
23
import gi
34
gi.require_version('GdkPixbuf', '2.0')
@@ -13,8 +14,10 @@ def replace_repl(mo):
1314
return src_re.sub(replace_repl, buf)
1415

1516
if __name__ == '__main__':
16-
pixbuf64 = GdkPixbuf.Pixbuf.new_from_file("data/icons/hicolor/64x64/apps/caja-dropbox.png")
17-
pixbuf16 = GdkPixbuf.Pixbuf.new_from_file("data/icons/hicolor/16x16/apps/caja-dropbox.png")
17+
selfpath = os.path.abspath(sys.argv[0])
18+
top_srcdir = os.path.dirname(selfpath)
19+
pixbuf64 = GdkPixbuf.Pixbuf.new_from_file(os.path.join(top_srcdir, "data/icons/hicolor/64x64/apps/caja-dropbox.png"))
20+
pixbuf16 = GdkPixbuf.Pixbuf.new_from_file(os.path.join(top_srcdir, "data/icons/hicolor/16x16/apps/caja-dropbox.png"))
1821
src2dest = {'@PACKAGE_VERSION@': sys.argv[1],
1922
'@DESKTOP_FILE_DIR@': sys.argv[2],
2023
'@IMAGEDATA64@': ("GdkPixbuf.Pixbuf.new_from_data(%r, GdkPixbuf.Colorspace.RGB, %r, %r, %r, %r, %r)" %

0 commit comments

Comments
 (0)