Move boot files, language data, keymaps, etc. to /usr/share/anaconda/.

9 files changed, 15 insertions, 12 deletions

diff --git a/bootdisk/i386/Makefile.am b/bootdisk/i386/Makefile.am
index 32f1188eb..030b8d5e8 100644
--- a/bootdisk/i386/Makefile.am
+++ b/bootdisk/i386/Makefile.am
@@ -18,7 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 if IS_I386
-bootdir        = $(libdir)/$(PACKAGE_NAME)-runtime/boot
+bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
 dist_boot_DATA = boot.msg grub.conf syslinux.cfg
 endif
 
diff --git a/bootdisk/ppc/Makefile.am b/bootdisk/ppc/Makefile.am
index f754c3bb9..4f6e298a4 100644
--- a/bootdisk/ppc/Makefile.am
+++ b/bootdisk/ppc/Makefile.am
@@ -18,7 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 if IS_PPC
-bootdir        = $(libdir)/$(PACKAGE_NAME)-runtime/boot
+bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
 dist_boot_DATA = magic ofboot.b yaboot.conf.in bootinfo.txt mapping \
                  yaboot.conf.3264
 endif
diff --git a/bootdisk/s390x/Makefile.am b/bootdisk/s390x/Makefile.am
index 3c215607b..c75ccbe02 100644
--- a/bootdisk/s390x/Makefile.am
+++ b/bootdisk/s390x/Makefile.am
@@ -18,7 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 if IS_S390
-bootdir        = $(libdir)/$(PACKAGE_NAME)-runtime/boot
+bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
 dist_boot_DATA = generic.ins generic.prm redhat.exec
 endif
 
diff --git a/bootdisk/sparc/Makefile.am b/bootdisk/sparc/Makefile.am
index 7a833bfeb..4d2c3f29b 100644
--- a/bootdisk/sparc/Makefile.am
+++ b/bootdisk/sparc/Makefile.am
@@ -18,7 +18,7 @@
 # Author: Dennis Gilmore <dgilmore@redhat.com>
 
 if IS_SPARC
-bootdir        = $(libdir)/$(PACKAGE_NAME)-runtime/boot
+bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
 dist_boot_DATA = boot.msg silo.conf
 endif
 
diff --git a/bootdisk/x86_64/Makefile.am b/bootdisk/x86_64/Makefile.am
index 78886cd7e..a4012c55d 100644
--- a/bootdisk/x86_64/Makefile.am
+++ b/bootdisk/x86_64/Makefile.am
@@ -18,7 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 if IS_X86_64
-bootdir        = $(libdir)/$(PACKAGE_NAME)-runtime/boot
+bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
 dist_boot_DATA = boot.msg grub.conf syslinux.cfg
 endif
 
diff --git a/fonts/Makefile.am b/fonts/Makefile.am
index 42cae2a3a..5ad0197cd 100644
--- a/fonts/Makefile.am
+++ b/fonts/Makefile.am
@@ -18,7 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 if IS_FONT_ARCH
-fontsdir        = $(libdir)/$(PACKAGE_NAME)-runtime
+fontsdir        = $(datadir)/$(PACKAGE_NAME)
 dist_fonts_DATA = screenfont-$(ARCH).gz
 endif
 
diff --git a/loader/Makefile.am b/loader/Makefile.am
index a2b79d728..b54638f1d 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -18,22 +18,24 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 bootdir            = $(libdir)/$(PACKAGE_NAME)-runtime/loader
+shareddir          = $(datadir)/$(PACKAGE_NAME)
+
 boot_PROGRAMS      = loader
-boot_DATA          = loader.tr
-dist_boot_DATA     = unicode-linedraw-chars.txt
+shared_DATA        = loader.tr
+dist_shared_DATA   = unicode-linedraw-chars.txt
 noinst_PROGRAMS    = mkctype dirbrowser
 noinst_DATA        = ctype.c
 noinst_HEADERS     = *.h
 
 if IS_S390
 boot_PROGRAMS      += shutdown
-dist_boot_SCRIPTS  = linuxrc.s390
+dist_shared_SCRIPTS  = linuxrc.s390
 else
-boot_PROGRAMS      += init
+boot_PROGRAMS       += init
 endif
 
 if IS_KEYMAPS_OVERRIDE_ARCH
-keymapsdir         = $(libdir)/$(PACKAGE_NAME)-runtime
+keymapsdir         = $(datadir)/$(PACKAGE_NAME)
 keymaps_DATA       = keymaps-override-$(ARCH)
 endif
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 6d3562d2a..9ca8b1a36 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: David Cantrell <dcantrell@redhat.com>
 
-scriptsdir = $(libdir)/$(PACKAGE_NAME)-runtime
+scriptsdir = $(libexecdir)/$(PACKAGE_NAME)
 dist_scripts_SCRIPTS = upd-instroot mk-images buildinstall \
                        buildinstall.functions scrubtree getkeymaps \
                        makestamp.py maketreeinfo.py upd-updates
diff --git a/utils/Makefile.am b/utils/Makefile.am
index bfc8fd426..e2d64fb3d 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -18,6 +18,7 @@
 # Author: David Cantrell <dcantrell@redhat.com>
 
 utilsdir            = $(libdir)/$(PACKAGE_NAME)-runtime
+
 utils_PROGRAMS      = modlist mapshdr readmap
 dist_utils_SCRIPTS  = genmodinfo trimpciids
 noinst_PROGRAMS     = snarffont