diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2001-06-15 22:44:32 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2001-06-15 22:44:32 +0000 |
| commit | d1e66b79360761ee6011202830536c2fe0459d0a (patch) | |
| tree | e1ebee1f0be06d503ab6bc97158b1cff6a5a213c /lib | |
| parent | 997b820e94468aeb3fb1a6fd38bc52e34af6f9e6 (diff) | |
| download | e2fsprogs-d1e66b79360761ee6011202830536c2fe0459d0a.tar.gz | |
ChangeLog, Makefile.in:
Makefile.in: Fix bug in installation of ext2_types.h. It is a file
which is generated and is therefore found in the build directory, not
source directory.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ext2fs/ChangeLog | 4 | ||||
| -rw-r--r-- | lib/ext2fs/Makefile.in | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index db642c23..334b05d4 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,5 +1,9 @@ 2001-06-15 Theodore Tso <tytso@valinux.com> + * Makefile.in: Fix bug in installation of ext2_types.h. It is a + file which is generated and is therefore found in the + build directory, not source directory. + * ismounted.c (check_mntent_file): Use a test file in / to check to see if the root filesystem is mounted read-only. This protects against the case where /etc might not be on /, as diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 3847f21d..d5adcb67 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -112,7 +112,8 @@ SRCS= ext2_err.c \ $(srcdir)/version.c \ $(srcdir)/write_bb_file.c -HFILES= bitops.h ext2fs.h ext2_io.h ext2_fs.h ext2_types.h +HFILES= bitops.h ext2fs.h ext2_io.h ext2_fs.h +HFILES_IN= ext2_err.h ext2_types.h LIBRARY= libext2fs LIBDIR= ext2fs @@ -197,7 +198,7 @@ installdirs:: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ $(DESTDIR)$(includedir)/ext2fs -install:: all $(HFILES) installdirs +install:: all $(HFILES) $(HFILES_IN) installdirs $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a $(CHMOD) 644 $(DESTDIR)$(libdir)/libext2fs.a -$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a @@ -205,7 +206,9 @@ install:: all $(HFILES) installdirs for i in $(HFILES); do \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \ done - $(INSTALL_DATA) ext2_err.h $(DESTDIR)$(includedir)/ext2fs/ext2_err.h + for i in $(HFILES_IN); do \ + $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \ + done uninstall:: $(RM) -f $(DESTDIR)$(libdir)/libext2fs.a |