diff --git a/ChangeLog b/ChangeLog index 80821a6be..eefa217b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-04 Jason Thomas + + From Denis Kitzman : + * stage2/Makefile.am (libgrub_a_CFLAGS): Fixed a typo. + FSYS_XFS, USE_MD5_PASSWORDS, SUPPORT_SERIAL, and + SUPPORT_HERCULES did not get defined. + 2002-01-20 Yoshinori K. Okuji * util/grub-image.in: Check stage2 instead of stage2.c to diff --git a/stage2/Makefile.am b/stage2/Makefile.am index 513725ccd..bb17f5b00 100644 --- a/stage2/Makefile.am +++ b/stage2/Makefile.am @@ -20,7 +20,7 @@ libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \ fsys_xfs.c stage2.c md5.c libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ - -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 + -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 \ -DFSYS_XFS=1 -DUSE_MD5_PASSWORDS=1 \ -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings diff --git a/stage2/Makefile.in b/stage2/Makefile.in index deeb0dd97..079dc2d0a 100644 --- a/stage2/Makefile.in +++ b/stage2/Makefile.in @@ -113,7 +113,9 @@ libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ - -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 + -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 \ + -DFSYS_XFS=1 -DUSE_MD5_PASSWORDS=1 \ + -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec @@ -2572,8 +2574,6 @@ uninstall-am: uninstall-info-am uninstall-pkgdataDATA mostlyclean mostlyclean-compile mostlyclean-generic tags \ uninstall uninstall-am uninstall-info-am uninstall-pkgdataDATA - -DFSYS_XFS=1 -DUSE_MD5_PASSWORDS=1 \ - -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings stage2_size.h: pre_stage2 -rm -f stage2_size.h