summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makefile10
-rwxr-xr-xscripts/upd-instroot1
3 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c6e7ee6f6..d61f809b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
* docs/kickstart-docs.txt: Mark langsupport as deprecated and explain
what to do instead. Also clarify the purpose of the lang keyword.
+ * Makefile: Remove locale-list.
+ * scripts/upd-instroot (KEEPFILE): Likewise.
+
2005-06-27 Chris Lumens <clumens@redhat.com>
* fsset.py: Add a clobberDevice method used for obliterating
diff --git a/Makefile b/Makefile
index dbcd46520..ee09502b0 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,11 @@ CATALOGS = po/anaconda.pot
PYFILES = $(wildcard *.py)
-all: subdirs mini-wm xmouse.so xutils.so $(CATALOGS) lang-table lang-names locale-list
+all: subdirs mini-wm xmouse.so xutils.so $(CATALOGS) lang-table lang-names
-lang-names: lang-table locale-list
+lang-names: lang-table
PYTHONPATH="." $(PYTHON) scripts/getlangnames.py > lang-names
-locale-list:
- PYTHONPATH="." $(PYTHON) scripts/genlocalelist.py > locale-list
-
mini-wm: mini-wm.c
gcc -o mini-wm mini-wm.c `pkg-config gtk+-x11-2.0 --cflags --libs`$(CFLAGS)
@@ -42,7 +39,7 @@ depend:
for d in $(SUBDIRS); do make -C $$d depend; done
clean:
- rm -f *.o *.so *.pyc lang-names locale-list
+ rm -f *.o *.so *.pyc lang-names
for d in $(SUBDIRS); do make -C $$d clean; done
subdirs:
@@ -75,7 +72,6 @@ install:
cp -var $(PYFILES) $(DESTDIR)/$(PYTHONLIBDIR)
cp -a lang-table $(DESTDIR)/$(PYTHONLIBDIR)
cp -a lang-names $(DESTDIR)/$(PYTHONLIBDIR)
- cp -a locale-list $(DESTDIR)/$(ANACONDADATADIR)/locale-list
cp -a lang-table-kon $(DESTDIR)/$(PYTHONLIBDIR)
./py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR) $(PYFILES)
cp -a *.so $(DESTDIR)/$(PYTHONLIBDIR)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 2115983c2..187630e67 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -410,7 +410,6 @@ usr/sbin/ybin
usr/sbin/load_policy
usr/sbin/lvm
usr/sbin/build-locale-archive
-usr/share/anaconda/locale-list
usr/share/anaconda/anaconda.conf
usr/share/terminfo/b/bterm
usr/share/terminfo/l/linux