[PATCH 4/4] Update configure, make files, and PO files with new category changes.

Samantha N. Bueno sbueno+anaconda at redhat.com
Tue Jun 3 15:01:53 UTC 2014


---
 configure.ac                  |  3 +--
 po/POTFILES.in                | 18 ++++++------------
 pyanaconda/ui/gui/Makefile.am |  2 +-
 pyanaconda/ui/tui/Makefile.am |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9cbff60..356ab9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,15 +208,14 @@ AC_CONFIG_FILES([Makefile
                  pyanaconda/isys/Makefile
                  pyanaconda/packaging/Makefile
                  pyanaconda/ui/Makefile
+                 pyanaconda/ui/categories/Makefile
                  pyanaconda/ui/lib/Makefile
-                 pyanaconda/ui/gui/categories/Makefile
                  pyanaconda/ui/gui/hubs/Makefile
                  pyanaconda/ui/gui/spokes/Makefile
                  pyanaconda/ui/gui/spokes/advstorage/Makefile
                  pyanaconda/ui/gui/spokes/lib/Makefile
                  pyanaconda/ui/gui/tools/Makefile
                  pyanaconda/ui/gui/Makefile
-                 pyanaconda/ui/tui/categories/Makefile
                  pyanaconda/ui/tui/hubs/Makefile
                  pyanaconda/ui/tui/simpleline/Makefile
                  pyanaconda/ui/tui/spokes/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 45ca933..943d15a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,6 +39,12 @@ pyanaconda/packaging/rpmostreepayload.py
 pyanaconda/ui/common.py
 pyanaconda/ui/helpers.py
 pyanaconda/ui/__init__.py
+pyanaconda/ui/categories/__init__.py
+pyanaconda/ui/categories/customization.py
+pyanaconda/ui/categories/localization.py
+pyanaconda/ui/categories/software.py
+pyanaconda/ui/categories/system.py
+pyanaconda/ui/categories/user_settings.py
 
 # Common stuff
 pyanaconda/ui/lib/space.py
@@ -63,21 +69,9 @@ pyanaconda/ui/tui/spokes/warnings.py
 pyanaconda/ui/tui/spokes/progress.py
 pyanaconda/ui/tui/spokes/__init__.py
 pyanaconda/ui/tui/__init__.py
-pyanaconda/ui/tui/categories/__init__.py
-pyanaconda/ui/tui/categories/customization.py
-pyanaconda/ui/tui/categories/localization.py
-pyanaconda/ui/tui/categories/software.py
-pyanaconda/ui/tui/categories/system.py
-pyanaconda/ui/tui/categories/user_settings.py
 
 # Graphical interface
 pyanaconda/ui/gui/__init__.py
-pyanaconda/ui/gui/categories/__init__.py
-pyanaconda/ui/gui/categories/customization.py
-pyanaconda/ui/gui/categories/localization.py
-pyanaconda/ui/gui/categories/software.py
-pyanaconda/ui/gui/categories/system.py
-pyanaconda/ui/gui/categories/user_settings.py
 pyanaconda/ui/gui/hubs/__init__.py
 pyanaconda/ui/gui/hubs/progress.py
 pyanaconda/ui/gui/spokes/custom.py
diff --git a/pyanaconda/ui/gui/Makefile.am b/pyanaconda/ui/gui/Makefile.am
index 272cebb..013c550 100644
--- a/pyanaconda/ui/gui/Makefile.am
+++ b/pyanaconda/ui/gui/Makefile.am
@@ -15,7 +15,7 @@
 #
 # Author: Chris Lumens <clumens at redhat.com>
 
-SUBDIRS = categories hubs spokes tools
+SUBDIRS = hubs spokes tools
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/pyanaconda/ui/tui/Makefile.am b/pyanaconda/ui/tui/Makefile.am
index 1e4f472..389638e 100644
--- a/pyanaconda/ui/tui/Makefile.am
+++ b/pyanaconda/ui/tui/Makefile.am
@@ -15,7 +15,7 @@
 #
 # Author: Chris Lumens <clumens at redhat.com>
 
-SUBDIRS = categories hubs spokes simpleline tools
+SUBDIRS = hubs spokes simpleline tools
 
 MAINTAINERCLEANFILES = Makefile.in
 
-- 
1.8.3.1



More information about the anaconda-patches mailing list