Attachment #211170 for bug #294600

View | Details | Raw Unified | Return to bug 294600
Collapse All | Expand All

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

gajimsrc4dir = $(pkglibdir)/command_system
gajimsrc4_PYTHON = \
				   $(srcdir)/command_system/*.py

gajimsrc5dir = $(pkglibdir)/command_system/implementation
gajimsrc5_PYTHON = \
				   $(srcdir)/command_system/implementation/*.py


Return to bug 294600

Lines 26-51 Link Here

(-)a/src/Makefile.am (-6 / +6 lines)
26	--override $(srcdir)/trayicon.override \	26	--override $(srcdir)/trayicon.override \
27	$(srcdir)/trayicon.defs > $@	27	$(srcdir)/trayicon.defs > $@
28	endif	28	endif
29	gajimsrcdir = $(pkgdatadir)/src	29	gajimsrcdir = $(pkglibdir)
30	gajimsrc_PYTHON = $(srcdir)/*.py	30	gajimsrc_PYTHON = $(srcdir)/*.py
31		31
32	gajimsrc1dir = $(pkgdatadir)/src/common	32	gajimsrc1dir = $(pkglibdir)/common
33	gajimsrc1_PYTHON = \	33	gajimsrc1_PYTHON = \
34	$(srcdir)/common/*.py	34	$(srcdir)/common/*.py
35		35
36	gajimsrc2dir = $(pkgdatadir)/src/common/xmpp	36	gajimsrc2dir = $(pkglibdir)/common/xmpp
37	gajimsrc2_PYTHON = \	37	gajimsrc2_PYTHON = \
38	$(srcdir)/common/xmpp/*.py	38	$(srcdir)/common/xmpp/*.py
39		39
40	gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf	40	gajimsrc3dir = $(pkglibdir)/common/zeroconf
41	gajimsrc3_PYTHON = \	41	gajimsrc3_PYTHON = \
42	$(srcdir)/common/zeroconf/*.py	42	$(srcdir)/common/zeroconf/*.py
43		43
44	gajimsrc4dir = $(pkgdatadir)/src/command_system	44	gajimsrc4dir = $(pkglibdir)/command_system
45	gajimsrc4_PYTHON = \	45	gajimsrc4_PYTHON = \
46	$(srcdir)/command_system/*.py	46	$(srcdir)/command_system/*.py
47		47
48	gajimsrc5dir = $(pkgdatadir)/src/command_system/implementation	48	gajimsrc5dir = $(pkglibdir)/command_system/implementation
49	gajimsrc5_PYTHON = \	49	gajimsrc5_PYTHON = \
50	$(srcdir)/command_system/implementation/*.py	50	$(srcdir)/command_system/implementation/*.py
51		51