* stage1/Makefile.am: Move stage files to pkglibdir.

        * stage2/Makefile.am: Likewise.
        * docs/grub.texi: s,/usr/share,/usr/lib,g.
        * util/grub-image.in: Look for stage files in pkglibdir.
        * util/grub-install.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 01b44d25a6e5abc8273058f22f00a0d936d09dfc..bf620d3694e2eda3029f86e8c3646b0c089dc588 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-24  Robert Millan  <robertmh@gnu.org>
+
+       Fixes for FHS compliance. (/usr/share is for arch-independant data)
+
+       * stage1/Makefile.am: Move stage files to pkglibdir.
+       * stage2/Makefile.am: Likewise.
+       * docs/grub.texi: s,/usr/share,/usr/lib,g.
+       * util/grub-image.in: Look for stage files in pkglibdir.
+       * util/grub-install.in: Likewise.
+
 2004-06-20  Yoshinori K. Okuji  <okuji@enbug.org>
 
        This is a big change on saving a default entry. This change

diff --git a/Makefile.in b/Makefile.in
index 3d58d262271ffd1118950097fb63f43fab734de1..2c0b4aaf82bd964b25dd11a94fc6cc263e006a73 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -313,14 +313,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
-       if (etags --etags-include --version) >/dev/null 2>&1; then \
+       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
          include_option=--etags-include; \
+         empty_fix=.; \
        else \
          include_option=--include; \
+         empty_fix=; \
        fi; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
-           test -f $$subdir/TAGS && \
+           test ! -f $$subdir/TAGS || \
              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
@@ -330,9 +332,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -441,7 +445,7 @@ distcheck: dist
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+         GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
@@ -464,7 +468,7 @@ distcheck: dist
                distuninstallcheck \
          && chmod -R a-w "$$dc_install_base" \
          && ({ \
-              (cd ../.. && $(mkdir_p) "$$dc_destdir") \
+              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \

diff --git a/docs/Makefile.in b/docs/Makefile.in
index dd099fd33535066e75ad21596eb2fc6d082727f4..ee70b371b955f8d6fd707bf6328649a319f3f5c2 100644 (file)
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -83,7 +83,7 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
-am__installdirs = $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
+am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -378,8 +378,8 @@ uninstall-info-am:
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
-           echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \
-           install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \
+           echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
+           install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
          done; \
        else :; fi
        @$(NORMAL_UNINSTALL)
@@ -387,7 +387,7 @@ uninstall-info-am:
        for file in $$list; do \
          relfile=`echo "$$file" | sed 's|^.*/||'`; \
          relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-         (if cd $(DESTDIR)$(infodir); then \
+         (if cd "$(DESTDIR)$(infodir)"; then \
             echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
             rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
           else :; fi); \
@@ -424,7 +424,7 @@ maintainer-clean-aminfo:
        done
 install-man1: $(man1_MANS) $(man_MANS)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(man1dir)
+       test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
        @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
        l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
        for i in $$l2; do \
@@ -443,8 +443,8 @@ install-man1: $(man1_MANS) $(man_MANS)
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
          inst=`echo $$inst | sed -e 's/^.*\///'`; \
          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-         $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+         echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+         $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
        done
 uninstall-man1:
        @$(NORMAL_UNINSTALL)
@@ -464,12 +464,12 @@ uninstall-man1:
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
          inst=`echo $$inst | sed -e 's/^.*\///'`; \
          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-         rm -f $(DESTDIR)$(man1dir)/$$inst; \
+         echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+         rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
        done
 install-man8: $(man8_MANS) $(man_MANS)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(man8dir)
+       test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
        @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
        l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
        for i in $$l2; do \
@@ -488,8 +488,8 @@ install-man8: $(man8_MANS) $(man_MANS)
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
          inst=`echo $$inst | sed -e 's/^.*\///'`; \
          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-         $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+         echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+         $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
        done
 uninstall-man8:
        @$(NORMAL_UNINSTALL)
@@ -509,8 +509,8 @@ uninstall-man8:
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
          inst=`echo $$inst | sed -e 's/^.*\///'`; \
          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-         rm -f $(DESTDIR)$(man8dir)/$$inst; \
+         echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+         rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -533,9 +533,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -593,7 +595,9 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(SCRIPTS) $(MANS)
 installdirs:
-       $(mkdir_p) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
+       for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -649,7 +653,7 @@ install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(infodir)
+       test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        list='$(INFO_DEPS)'; \
        for file in $$list; do \
@@ -662,8 +666,8 @@ install-info-am: $(INFO_DEPS)
                        $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
            if test -f $$ifile; then \
              relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
-             echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
-             $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
+             echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
+             $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
            else : ; fi; \
          done; \
        done
@@ -673,8 +677,8 @@ install-info-am: $(INFO_DEPS)
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
-           echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
-           install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
+           echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
+           install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
          done; \
        else : ; fi
 install-man: install-man1 install-man8

diff --git a/docs/grub.texi b/docs/grub.texi
index 8a23e15b6fea7ba429a309627e7330f2f1854c1b..c16d07cbf6d8d7d8881d6894407928049868216c 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -476,13 +476,13 @@ have an emergency boot disk ready, so that you can rescue your computer
 if, by any chance, your hard drive becomes unusable (unbootable).
 
 GRUB comes with boot images, which are normally put in the directory
-@file{/usr/share/grub/i386-pc}. If you do not use grub-install, then
+@file{/usr/lib/grub/i386-pc}. If you do not use grub-install, then
 you need to copy the files @file{stage1}, @file{stage2}, and
 @file{*stage1_5} to the directory @file{/boot/grub}, and run the
 @command{grub-set-default} (@pxref{Invoking grub-set-default}) if you
 intend to use @samp{default saved} (@pxref{default}) in your
 configuration file. Hereafter, the directory where GRUB images are
-initially placed (normally @file{/usr/share/grub/i386-pc}) will be
+initially placed (normally @file{/usr/lib/grub/i386-pc}) will be
 called the @dfn{image directory}, and the directory where the boot
 loader needs to find them (usually @file{/boot/grub}) will be called
 the @dfn{boot directory}.
@@ -510,7 +510,7 @@ commands:
 
 @example
 @group
-# @kbd{cd /usr/share/grub/i386-pc}
+# @kbd{cd /usr/lib/grub/i386-pc}
 # @kbd{dd if=stage1 of=/dev/fd0 bs=512 count=1}
 1+0 records in
 1+0 records out
@@ -704,7 +704,7 @@ $ @kbd{mkdir -p iso/boot/grub}
 Copy the file @file{stage2_eltorito}:
 
 @example
-$ @kbd{cp /usr/share/grub/i386-pc/stage2_eltorito iso/boot/grub}
+$ @kbd{cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub}
 @end example
 
 If desired, make the config file @file{menu.lst} under @file{iso/boot/grub}

diff --git a/grub/Makefile.in b/grub/Makefile.in
index b047ae20642372a6adc6cc92e506c47990d35eee..86a1651f46e2009fd5800a1d7ef7650ff034109c 100644 (file)
--- a/grub/Makefile.in
+++ b/grub/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -48,7 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(sbindir)
+am__installdirs = "$(DESTDIR)$(sbindir)"
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(sbin_PROGRAMS)
 am_grub_OBJECTS = main.$(OBJEXT) asmstub.$(OBJEXT)
@@ -223,14 +223,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(sbindir)
+       test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
        @list='$(sbin_PROGRAMS)'; for p in $$list; do \
          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
          if test -f $$p \
          ; then \
            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
-          $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+          echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+          $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
          else :; fi; \
        done
 
@@ -238,8 +238,8 @@ uninstall-sbinPROGRAMS:
        @$(NORMAL_UNINSTALL)
        @list='$(sbin_PROGRAMS)'; for p in $$list; do \
          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-         echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
-         rm -f $(DESTDIR)$(sbindir)/$$f; \
+         echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(sbindir)/$$f"; \
        done
 
 clean-sbinPROGRAMS:
@@ -294,9 +294,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -351,7 +353,9 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
-       $(mkdir_p) $(DESTDIR)$(sbindir)
+       for dir in "$(DESTDIR)$(sbindir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am

diff --git a/lib/Makefile.in b/lib/Makefile.in
index e453335237383a6a63c17b2e292f85060bd791aa..9cb63e5302845072e4859ce7fca1b44942b6193a 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47,9 +47,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libcommon_a_AR = $(AR) $(ARFLAGS)
 libcommon_a_LIBADD =
 am_libcommon_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \
@@ -269,9 +269,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)

diff --git a/netboot/Makefile.in b/netboot/Makefile.in
index 651863f082d5c4d0da2c712abd136803b4ac3c04..fada6b4ffad8b2df9a73982c585f73f946c53c42 100644 (file)
--- a/netboot/Makefile.in
+++ b/netboot/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47,9 +47,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libdrivers_a_AR = $(AR) $(ARFLAGS)
 am_libdrivers_a_OBJECTS = libdrivers_a-config.$(OBJEXT) \
        libdrivers_a-fsys_tftp.$(OBJEXT) libdrivers_a-main.$(OBJEXT) \
@@ -909,9 +909,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)

diff --git a/stage1/Makefile.am b/stage1/Makefile.am
index b8b76685ee47aa304ac4c32d7379f10fc066e531..0afc285279a48f00a3d5f9269d0e5d512d1104a7 100644 (file)
--- a/stage1/Makefile.am
+++ b/stage1/Makefile.am
@@ -1,7 +1,7 @@
-pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
-nodist_pkgdata_DATA = stage1
+pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+nodist_pkglib_DATA = stage1
 
-CLEANFILES = $(nodist_pkgdata_DATA)
+CLEANFILES = $(nodist_pkglib_DATA)
 
 # We can't use builtins or standard includes.
 AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc

diff --git a/stage1/Makefile.in b/stage1/Makefile.in
index 0c45172ab73fae544707fc7fbc999b87e9599e35..7012740af38610e22b205aacd3d9ea8178507716 100644 (file)
--- a/stage1/Makefile.in
+++ b/stage1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20,7 +20,7 @@ SOURCES = $(stage1_exec_SOURCES)
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-pkglibdir = $(libdir)/@PACKAGE@
+pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -60,13 +60,13 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(stage1_exec_SOURCES)
 DIST_SOURCES = $(stage1_exec_SOURCES)
-am__installdirs = $(DESTDIR)$(pkgdatadir)
-nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(nodist_pkgdata_DATA)
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+nodist_pkglibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(nodist_pkglib_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
@@ -174,8 +174,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-nodist_pkgdata_DATA = stage1
-CLEANFILES = $(nodist_pkgdata_DATA)
+nodist_pkglib_DATA = stage1
+CLEANFILES = $(nodist_pkglib_DATA)
 
 # We can't use builtins or standard includes.
 AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
@@ -233,22 +233,22 @@ distclean-compile:
 .S.obj:
        $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
-install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA)
+install-nodist_pkglibDATA: $(nodist_pkglib_DATA)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(pkgdatadir)
-       @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+       test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+       @list='$(nodist_pkglib_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(nodist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
-         $(nodist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+         echo " $(nodist_pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+         $(nodist_pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
        done
 
-uninstall-nodist_pkgdataDATA:
+uninstall-nodist_pkglibDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+       @list='$(nodist_pkglib_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
-         rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
+         echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -271,9 +271,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -328,7 +330,9 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs:
-       $(mkdir_p) $(DESTDIR)$(pkgdatadir)
+       for dir in "$(DESTDIR)$(pkglibdir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -373,9 +377,9 @@ info: info-am
 
 info-am:
 
-install-data-am: install-nodist_pkgdataDATA
+install-data-am:
 
-install-exec-am:
+install-exec-am: install-nodist_pkglibDATA
 
 install-info: install-info-am
 
@@ -399,19 +403,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nodist_pkgdataDATA
+uninstall-am: uninstall-info-am uninstall-nodist_pkglibDATA
 
 .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_pkgdataDATA \
+       install-info-am install-man install-nodist_pkglibDATA \
        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_pkgdataDATA
+       uninstall-nodist_pkglibDATA
 
 .exec:
        $(OBJCOPY) -O binary $< $@

diff --git a/stage2/Makefile.am b/stage2/Makefile.am
index cdfbde24cb50716bc95659925750a4b46f6a954b..3a32ae7501ef2795936c1839eff552ba21aa4821 100644 (file)
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -28,12 +28,12 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
        -fwritable-strings
 
 # Stage 2 and Stage 1.5's.
-pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
 
 EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
 
 if DISKLESS_SUPPORT
-pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+pkglib_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
@@ -44,7 +44,7 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
        reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
        xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
 else
-pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+pkglib_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
@@ -106,7 +106,7 @@ else
 BUILT_SOURCES = stage2_size.h
 endif
 
-CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
 
 stage2_size.h: pre_stage2
        -rm -f stage2_size.h

diff --git a/stage2/Makefile.in b/stage2/Makefile.in
index 037150fe4fe79f805b8624a36e600ace29b09673..ca28c17d3c58a69de261dff7c2547207fbb04fe2 100644 (file)
--- a/stage2/Makefile.in
+++ b/stage2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23,7 +23,7 @@ SOURCES = $(libgrub_a_SOURCES) $(diskless_exec_SOURCES) $(e2fs_stage1_5_exec_SOU
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-pkglibdir = $(libdir)/@PACKAGE@
+pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -82,9 +82,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libgrub_a_AR = $(AR) $(ARFLAGS)
 libgrub_a_LIBADD =
 am_libgrub_a_OBJECTS = libgrub_a-boot.$(OBJEXT) \
@@ -433,16 +433,16 @@ DIST_SOURCES = $(libgrub_a_SOURCES) $(diskless_exec_SOURCES) \
        $(start_exec_SOURCES) $(start_eltorito_exec_SOURCES) \
        $(ufs2_stage1_5_exec_SOURCES) $(vstafs_stage1_5_exec_SOURCES) \
        $(xfs_stage1_5_exec_SOURCES)
-am__installdirs = $(DESTDIR)$(pkgdatadir)
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(noinst_DATA) $(pkgdata_DATA)
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+pkglibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(noinst_DATA) $(pkglib_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 # Stage 2 and Stage 1.5's.
-pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
@@ -582,11 +582,11 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
        -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \
        -fwritable-strings
 
-@DISKLESS_SUPPORT_FALSE@pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+@DISKLESS_SUPPORT_FALSE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
 @DISKLESS_SUPPORT_FALSE@       ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
 @DISKLESS_SUPPORT_FALSE@       reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
 
-@DISKLESS_SUPPORT_TRUE@pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+@DISKLESS_SUPPORT_TRUE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
 @DISKLESS_SUPPORT_TRUE@        ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
 @DISKLESS_SUPPORT_TRUE@        reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
 @DISKLESS_SUPPORT_TRUE@        nbgrub pxegrub
@@ -624,7 +624,7 @@ pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
 @NETBOOT_SUPPORT_TRUE@pre_stage2_exec_LDADD = ../netboot/libdrivers.a
 @DISKLESS_SUPPORT_FALSE@BUILT_SOURCES = stage2_size.h
 @DISKLESS_SUPPORT_TRUE@BUILT_SOURCES = stage2_size.h diskless_size.h
-CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
 start_exec_SOURCES = start.S
 start_exec_CCASFLAGS = $(STAGE2_COMPILE)
 start_exec_LDFLAGS = $(START_LINK)
@@ -3331,22 +3331,22 @@ xfs_stage1_5_exec-bios.obj: bios.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfs_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o xfs_stage1_5_exec-bios.obj `if test -f 'bios.c'; then $(CYGPATH_W) 'bios.c'; else $(CYGPATH_W) '$(srcdir)/bios.c'; fi`
 uninstall-info-am:
-install-pkgdataDATA: $(pkgdata_DATA)
+install-pkglibDATA: $(pkglib_DATA)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(pkgdatadir)
-       @list='$(pkgdata_DATA)'; for p in $$list; do \
+       test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+       @list='$(pkglib_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
-         $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+         echo " $(pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+         $(pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
        done
 
-uninstall-pkgdataDATA:
+uninstall-pkglibDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(pkgdata_DATA)'; for p in $$list; do \
+       @list='$(pkglib_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
-         rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
+         echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -3369,9 +3369,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -3450,20 +3452,20 @@ check-TESTS: $(TESTS)
          skipped=""; \
          if test "$$skip" -ne 0; then \
            skipped="($$skip tests were not run)"; \
-           test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
+           test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
              dashes="$$skipped"; \
          fi; \
          report=""; \
          if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
            report="Please report to $(PACKAGE_BUGREPORT)"; \
-           test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
+           test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
              dashes="$$report"; \
          fi; \
          dashes=`echo "$$dashes" | sed s/./=/g`; \
          echo "$$dashes"; \
          echo "$$banner"; \
-         test -n "$$skipped" && echo "$$skipped"; \
-         test -n "$$report" && echo "$$report"; \
+         test -z "$$skipped" || echo "$$skipped"; \
+         test -z "$$report" || echo "$$report"; \
          echo "$$dashes"; \
          test "$$failed" -eq 0; \
        else :; fi
@@ -3502,7 +3504,9 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
                $(HEADERS)
 installdirs:
-       $(mkdir_p) $(DESTDIR)$(pkgdatadir)
+       for dir in "$(DESTDIR)$(pkglibdir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
@@ -3552,9 +3556,9 @@ info: info-am
 
 info-am:
 
-install-data-am: install-pkgdataDATA
+install-data-am:
 
-install-exec-am:
+install-exec-am: install-pkglibDATA
 
 install-info: install-info-am
 
@@ -3579,7 +3583,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+uninstall-am: uninstall-info-am uninstall-pkglibDATA
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
        clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
@@ -3587,11 +3591,11 @@ uninstall-am: uninstall-info-am uninstall-pkgdataDATA
        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-pkgdataDATA install-strip installcheck installcheck-am \
+       install-pkglibDATA 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-pkgdataDATA
+       uninstall-pkglibDATA
 
 
 stage2_size.h: pre_stage2

diff --git a/util/Makefile.in b/util/Makefile.in
index f643f7fd22325e22d6963c787da0067ec7053ffb..6beedf7759cf2d503d63838b5f3a88cfe77f5c89 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -53,7 +53,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = grub-image grub-install grub-md5-crypt \
        grub-terminfo grub-set-default
-am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_mbchk_OBJECTS = mbchk.$(OBJEXT)
@@ -236,14 +236,14 @@ grub-set-default: $(top_builddir)/config.status $(srcdir)/grub-set-default.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(bindir)
+       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
        @list='$(bin_PROGRAMS)'; for p in $$list; do \
          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
          if test -f $$p \
          ; then \
            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-          $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+          echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+          $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
          else :; fi; \
        done
 
@@ -251,8 +251,8 @@ uninstall-binPROGRAMS:
        @$(NORMAL_UNINSTALL)
        @list='$(bin_PROGRAMS)'; for p in $$list; do \
          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-         echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-         rm -f $(DESTDIR)$(bindir)/$$f; \
+         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(bindir)/$$f"; \
        done
 
 clean-binPROGRAMS:
@@ -262,13 +262,13 @@ mbchk$(EXEEXT): $(mbchk_OBJECTS) $(mbchk_DEPENDENCIES)
        $(LINK) $(mbchk_LDFLAGS) $(mbchk_OBJECTS) $(mbchk_LDADD) $(LIBS)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(sbindir)
+       test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
        @list='$(sbin_SCRIPTS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          if test -f $$d$$p; then \
            f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-           echo " $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f"; \
-           $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f; \
+           echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+           $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
          else :; fi; \
        done
 
@@ -276,8 +276,8 @@ uninstall-sbinSCRIPTS:
        @$(NORMAL_UNINSTALL)
        @list='$(sbin_SCRIPTS)'; for p in $$list; do \
          f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-         echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
-         rm -f $(DESTDIR)$(sbindir)/$$f; \
+         echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+         rm -f "$(DESTDIR)$(sbindir)/$$f"; \
        done
 
 mostlyclean-compile:
@@ -325,9 +325,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
@@ -382,7 +384,9 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS)
 installdirs:
-       $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am

diff --git a/util/grub-image.in b/util/grub-image.in
index 39b0af7db8fe1a04643f5ddba52bba2c661cc08c..ea632505fbede1f11f1fb8521583b9250c92d0ba 100644 (file)
--- a/util/grub-image.in
+++ b/util/grub-image.in
@@ -21,15 +21,15 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
-datadir=@datadir@
+libdir=@libdir@
 PACKAGE=@PACKAGE@
 host_cpu=@host_cpu@
 host_os=@host_os@
 host_vendor=@host_vendor@
 context=${host_cpu}-${host_vendor}
-pkgdatadir=${datadir}/${PACKAGE}/${context}
+pkglibdir=${libdir}/${PACKAGE}/${context}
 
-mke2fs=/sbin/mke2fs
+mke2fs=`which mke2fs`
 
 progname=`echo "$0" | sed 's%^.*/%%'`
 thisdir=`echo "$0" | sed 's%/[^/]*$%%'`
@@ -43,8 +43,8 @@ if test -f $thisdir/../stage2/stage2; then
   stage2dir="$thisdir/../stage2"
 else
   grub_shell=${sbindir}/grub
-  stage1dir="$pkgdatadir"
-  stage2dir="$pkgdatadir"
+  stage1dir="$pkglibdir"
+  stage2dir="$pkglibdir"
 fi
 
 # Exit on any error.

diff --git a/util/grub-install.in b/util/grub-install.in
index 33101f4cdc6620d08ae70ca8480b6b92e14fe554..3c90f6ea299a874ab239053c3698c1e119e924b8 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -21,13 +21,13 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
-datadir=@datadir@
+libdir=@libdir@
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
 host_cpu=@host_cpu@
 host_os=@host_os@
 host_vendor=@host_vendor@
-pkgdatadir=${datadir}/${PACKAGE}/${host_cpu}-${host_vendor}
+pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
 
 grub_shell=${sbindir}/grub
 grub_set_default=${sbindir}/grub-set-default
@@ -299,17 +299,17 @@ else
     exit 1
 fi
 
-if test -f "$pkgdatadir/stage1"; then
+if test -f "$pkglibdir/stage1"; then
     :
 else
-    echo "${pkgdatadir}/stage1: Not found." 1>&2
+    echo "${pkglibdir}/stage1: Not found." 1>&2
     exit 1
 fi
 
-if test -f "$pkgdatadir/stage2"; then
+if test -f "$pkglibdir/stage2"; then
     :
 else
-    echo "${pkgdatadir}/stage2: Not found." 1>&2
+    echo "${pkglibdir}/stage2: Not found." 1>&2
     exit 1
 fi
 
@@ -407,7 +407,7 @@ for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
     rm -f $file || exit 1
 done
 for file in \
-    ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
+    ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
     cp -f $file ${grubdir} || exit 1
 done