Attachment #193908 for bug #251298

Lines 5-11 Link Here

(-)a/data/Makefile.am (-1 / +1 lines)
5	desktop_in_files = gajim.desktop.in.in	5	desktop_in_files = gajim.desktop.in.in
6	desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)	6	desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
7		7
8	installdefsdir = $(pkgdatadir)/src/common	8	installdefsdir = $(pkglibdir)/common
9	installdefs_DATA = defs.py	9	installdefs_DATA = defs.py
10		10
11	soundsdir = $(pkgdatadir)/data/sounds	11	soundsdir = $(pkgdatadir)/data/sounds

Lines 32-37 Link Here

(-)a/scripts/gajim.in (-1 / +1 lines)
32	export datadir=@DATADIR@/gajim	32	export datadir=@DATADIR@/gajim
33	PYTHON_EXEC=@PYTHON@	33	PYTHON_EXEC=@PYTHON@
34		34
35	cd ${datadir}/src	35	cd @LIBDIR@/gajim
36	export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"	36	export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
37	exec ${PYTHON_EXEC} -OO $APP.py "$@"	37	exec ${PYTHON_EXEC} -OO $APP.py "$@"




		    --override $(srcdir)/trayicon.override \
		    $(srcdir)/trayicon.defs > $@
endif
gajimsrcdir = $(pkglibdir)
gajimsrc_PYTHON = $(srcdir)/*.py 

gajimsrc1dir = $(pkglibdir)/common
gajimsrc1_PYTHON = \
				$(srcdir)/common/*.py 

gajimsrc2dir = $(pkglibdir)/common/xmpp
gajimsrc2_PYTHON = \
				$(srcdir)/common/xmpp/*.py 

gajimsrc3dir = $(pkglibdir)/common/zeroconf
gajimsrc3_PYTHON = \
				$(srcdir)/common/zeroconf/*.py 


Return to bug 251298

Lines 43-60 Link Here

(-)a/src/Makefile.am (-4 / +4 lines)
43	--override $(srcdir)/trayicon.override \	43	--override $(srcdir)/trayicon.override \
44	$(srcdir)/trayicon.defs > $@	44	$(srcdir)/trayicon.defs > $@
45	endif	45	endif
46	gajimsrcdir = $(pkgdatadir)/src	46	gajimsrcdir = $(pkglibdir)
47	gajimsrc_PYTHON = $(srcdir)/*.py	47	gajimsrc_PYTHON = $(srcdir)/*.py
48		48
49	gajimsrc1dir = $(pkgdatadir)/src/common	49	gajimsrc1dir = $(pkglibdir)/common
50	gajimsrc1_PYTHON = \	50	gajimsrc1_PYTHON = \
51	$(srcdir)/common/*.py	51	$(srcdir)/common/*.py
52		52
53	gajimsrc2dir = $(pkgdatadir)/src/common/xmpp	53	gajimsrc2dir = $(pkglibdir)/common/xmpp
54	gajimsrc2_PYTHON = \	54	gajimsrc2_PYTHON = \
55	$(srcdir)/common/xmpp/*.py	55	$(srcdir)/common/xmpp/*.py
56		56
57	gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf	57	gajimsrc3dir = $(pkglibdir)/common/zeroconf
58	gajimsrc3_PYTHON = \	58	gajimsrc3_PYTHON = \
59	$(srcdir)/common/zeroconf/*.py	59	$(srcdir)/common/zeroconf/*.py
60		60