[PATCH] Include the new lib directory in the package (#886319, #886470).
Chris Lumens
clumens at redhat.com
Wed Dec 12 15:36:56 UTC 2012
---
configure.ac | 1 +
po/POTFILES.in | 3 +++
pyanaconda/ui/Makefile.am | 4 ++--
pyanaconda/ui/lib/Makefile.am | 22 ++++++++++++++++++++++
4 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 pyanaconda/ui/lib/Makefile.am
diff --git a/configure.ac b/configure.ac
index 27e7cc1..85bca0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,7 @@ AC_CONFIG_FILES([Makefile
pyanaconda/storage/devicelibs/Makefile
pyanaconda/storage/formats/Makefile
pyanaconda/ui/Makefile
+ pyanaconda/ui/lib/Makefile
pyanaconda/ui/gui/categories/Makefile
pyanaconda/ui/gui/hubs/Makefile
pyanaconda/ui/gui/spokes/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e58edf5..bf5b640 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,6 +58,9 @@ pyanaconda/storage/zfcp.py
pyanaconda/ui/common.py
pyanaconda/ui/__init__.py
+# Common stuff
+pyanaconda/ui/lib/space.py
+
# Text interface
pyanaconda/ui/tui/hubs/progress.py
pyanaconda/ui/tui/hubs/summary.py
diff --git a/pyanaconda/ui/Makefile.am b/pyanaconda/ui/Makefile.am
index cff34cc..69051fa 100644
--- a/pyanaconda/ui/Makefile.am
+++ b/pyanaconda/ui/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Red Hat, Inc.
+# Copyright (C) 2011, 2012 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published
@@ -15,7 +15,7 @@
#
# Author: Chris Lumens <clumens at redhat.com>
-SUBDIRS = gui tui
+SUBDIRS = gui lib tui
MAINTAINERCLEANFILES = Makefile.in
diff --git a/pyanaconda/ui/lib/Makefile.am b/pyanaconda/ui/lib/Makefile.am
new file mode 100644
index 0000000..5098c96
--- /dev/null
+++ b/pyanaconda/ui/lib/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright (C) 2012 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens at redhat.com>
+
+MAINTAINERCLEANFILES = Makefile.in
+
+pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
+commondir = $(pkgpyexecdir)/ui/lib
+common_PYTHON = *.py
--
1.7.11.2
More information about the anaconda-patches
mailing list