--- grub-0.97/stage1/Makefile.am.datadir 2005-12-14 11:07:01.000000000 -0500 +++ grub-0.97/stage1/Makefile.am 2005-12-14 11:07:21.000000000 -0500 @@ -1,7 +1,7 @@ -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) -nodist_pkglib_DATA = stage1 +pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) +nodist_pkgdata_DATA = stage1 -CLEANFILES = $(nodist_pkglib_DATA) +CLEANFILES = $(nodist_pkgdata_DATA) # We can't use builtins or standard includes. AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc --- grub-0.97/stage1/Makefile.in.datadir 2005-05-07 22:42:36.000000000 -0400 +++ grub-0.97/stage1/Makefile.in 2005-12-14 11:08:13.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(stage1_exec_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -67,13 +65,13 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkglibdir)" -nodist_pkglibDATA_INSTALL = $(INSTALL_DATA) -DATA = $(nodist_pkglib_DATA) +am__installdirs = "$(DESTDIR)$(pkgdatadir)" +nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(nodist_pkgdata_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) +pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -102,6 +100,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@ +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@ @@ -172,6 +172,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ +datadir = @datadir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -183,8 +184,8 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -nodist_pkglib_DATA = stage1 -CLEANFILES = $(nodist_pkglib_DATA) +nodist_pkgdata_DATA = stage1 +CLEANFILES = $(nodist_pkgdata_DATA) # We can't use builtins or standard includes. AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc @@ -242,22 +243,22 @@ .S.obj: $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: -install-nodist_pkglibDATA: $(nodist_pkglib_DATA) +install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)" - @list='$(nodist_pkglib_DATA)'; for p in $$list; do \ + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(nodist_pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ + echo " $(nodist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + $(nodist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done -uninstall-nodist_pkglibDATA: +uninstall-nodist_pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(nodist_pkglib_DATA)'; for p in $$list; do \ + @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -339,7 +340,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ + for dir in "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -388,7 +389,7 @@ install-data-am: -install-exec-am: install-nodist_pkglibDATA +install-exec-am: install-nodist_pkgdataDATA install-info: install-info-am @@ -412,19 +413,19 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-nodist_pkglibDATA +uninstall-am: uninstall-info-am uninstall-nodist_pkgdataDATA .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstPROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-nodist_pkglibDATA \ + install-info-am install-man install-nodist_pkgdataDATA \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ - uninstall-nodist_pkglibDATA + uninstall-nodist_pkgdataDATA .exec: $(OBJCOPY) -O binary $< $@ --- grub-0.97/util/grub-install.in.datadir 2005-12-14 11:00:21.000000000 -0500 +++ grub-0.97/util/grub-install.in 2005-12-14 11:00:21.000000000 -0500 @@ -21,13 +21,13 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ sbindir=@sbindir@ -libdir=@libdir@ +datadir=@datadir@ PACKAGE=@PACKAGE@ VERSION=@VERSION@ host_cpu=@host_cpu@ host_os=@host_os@ host_vendor=@host_vendor@ -pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor} +pkgdatadir=${datadir}/${PACKAGE}/${host_cpu}-${host_vendor} grub_shell=${sbindir}/grub mdadm=${sbindir}/mdadm @@ -388,17 +388,17 @@ exit 1 fi -if test -f "$pkglibdir/stage1"; then +if test -f "$pkgdatadir/stage1"; then : else - echo "${pkglibdir}/stage1: Not found." 1>&2 + echo "${pkgdatadir}/stage1: Not found." 1>&2 exit 1 fi -if test -f "$pkglibdir/stage2"; then +if test -f "$pkgdatadir/stage2"; then : else - echo "${pkglibdir}/stage2: Not found." 1>&2 + echo "${pkgdatadir}/stage2: Not found." 1>&2 exit 1 fi --- grub-0.97/stage2/Makefile.am.datadir 2005-12-14 11:03:54.000000000 -0500 +++ grub-0.97/stage2/Makefile.am 2005-12-14 11:05:04.000000000 -0500 @@ -27,12 +27,12 @@ -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 # Stage 2 and Stage 1.5's. -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) +pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec if DISKLESS_SUPPORT -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \ nbgrub pxegrub @@ -43,7 +43,7 @@ reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \ xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec else -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 noinst_DATA = pre_stage2 start start_eltorito @@ -112,7 +112,7 @@ BUILT_SOURCES = stage2_size.h endif -CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES) +CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES) stage2_size.h: pre_stage2 -rm -f stage2_size.h