From 62fcc8eb761bf4a684d272035ae639bc17bb12b6 Mon Sep 17 00:00:00 2001
From: Dimitur Kirov <dkirov@gmail.com>
Date: Fri, 13 Oct 2006 08:15:20 +0000
Subject: [PATCH] move defs.py.in in data/ dir
---
Makefile.am | 2 +-
configure.ac | 2 +-
data/Makefile.am | 12 +++++++++---
{src/common => data}/defs.py.in | 0
4 files changed, 11 insertions(+), 5 deletions(-)
rename {src/common => data}/defs.py.in (100%)
diff --git a/Makefile.am b/Makefile.am
index 523bd7ba8b..bf680095be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data src po
+SUBDIRS = src data po
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index d58b2e987d..5def3962a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,9 +154,9 @@ AC_CONFIG_FILES([
data/pixmaps/Makefile
data/iconsets/Makefile
data/gajim.desktop.in
+ data/defs.py
src/Makefile
src/common/Makefile
- src/common/defs.py
scripts/gajim
po/Makefile.in
])
diff --git a/data/Makefile.am b/data/Makefile.am
index 1e92a0a329..9d43afdd08 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,6 +5,9 @@ desktopdir = $(datadir)/applications
desktop_in_files = gajim.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+installdefsdir = $(pkgdatadir)/src
+installdefs_DATA = defs.py
+
soundsdir = $(pkgdatadir)/data/sounds
sounds_DATA = $(srcdir)/sounds/*.wav
@@ -17,10 +20,13 @@ man_MANS = gajim.1 gajim-remote.1
EXTRA_DIST = $(desktop_in_files) \
$(sounds_DATA) \
$(other_DATA) \
- $(man_MANS)
+ $(man_MANS) \
+ defs.py.in
+
-DISTCLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(desktop_DATA) \
+ $(installdefs_DATA)
-CLEANFILES = gajim.desktop
+CLEANFILES = gajim.desktop
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/common/defs.py.in b/data/defs.py.in
similarity index 100%
rename from src/common/defs.py.in
rename to data/defs.py.in
--
GitLab