---
bootdisk/i386/Makefile.am | 2 +-
bootdisk/ppc/Makefile.am | 2 +-
bootdisk/s390x/Makefile.am | 2 +-
bootdisk/sparc/Makefile.am | 2 +-
bootdisk/x86_64/Makefile.am | 2 +-
fonts/Makefile.am | 2 +-
loader/Makefile.am | 12 +++++++-----
scripts/Makefile.am | 2 +-
utils/Makefile.am | 4 +++-
9 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/bootdisk/i386/Makefile.am b/bootdisk/i386/Makefile.am
index 32f1188..030b8d5 100644
--- a/bootdisk/i386/Makefile.am
+++ b/bootdisk/i386/Makefile.am
@@ -18,7 +18,7 @@
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
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 f754c3b..4f6e298 100644
--- a/bootdisk/ppc/Makefile.am
+++ b/bootdisk/ppc/Makefile.am
@@ -18,7 +18,7 @@
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
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 3c21560..c75ccbe 100644
--- a/bootdisk/s390x/Makefile.am
+++ b/bootdisk/s390x/Makefile.am
@@ -18,7 +18,7 @@
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
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 7a833bf..4d2c3f2 100644
--- a/bootdisk/sparc/Makefile.am
+++ b/bootdisk/sparc/Makefile.am
@@ -18,7 +18,7 @@
# Author: Dennis Gilmore <dgilmore@xxxxxxxxxx>
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 78886cd..a4012c5 100644
--- a/bootdisk/x86_64/Makefile.am
+++ b/bootdisk/x86_64/Makefile.am
@@ -18,7 +18,7 @@
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
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 42cae2a..5ad0197 100644
--- a/fonts/Makefile.am
+++ b/fonts/Makefile.am
@@ -18,7 +18,7 @@
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
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 a2b79d7..b54638f 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -18,22 +18,24 @@
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
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 6d3562d..7bc04b6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
-scriptsdir = $(libdir)/$(PACKAGE_NAME)-runtime
+scriptsdir = $(datadir)/$(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 bfc8fd4..6f2b527 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -18,8 +18,10 @@
# Author: David Cantrell <dcantrell@xxxxxxxxxx>
utilsdir = $(libdir)/$(PACKAGE_NAME)-runtime
+shareddir = $(datadir)/$(PACKAGE_NAME)
+
utils_PROGRAMS = modlist mapshdr readmap
-dist_utils_SCRIPTS = genmodinfo trimpciids
+dist_shared_SCRIPTS = genmodinfo trimpciids
noinst_PROGRAMS = snarffont
dist_noinst_SCRIPTS = filtermoddeps
--
1.6.5.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
