ChangeLog, Makefile.in, MCONFIG.in:

  Makefile.in: Use && after a cd command so that the right thing happens
  	if the directory is missing.  Don't compile man pages upon
  	installation any more, since modern Linux systems don't have
  	/usr/man/cat? anymore (they typically cache man pages in /var/catman
  	and delete them if they haven't been used in a while, to save on disk
  	space, and because CPU's are fast enough these days that you can get
  	away with this).
  MCONFIG.in: Add a new makefile variable for the share directory (i.e.,
  	/usr/share).  Make an autoconf magic make rule so that
  	$(top_builddir)/util/subst.conf gets rebuilt automatically when
  	necessary.

diff --git a/ChangeLog b/ChangeLog
index 4000863..c401e13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1998-03-28  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Use && after a cd command so that the right thing
+               happens if the directory is missing.  Don't compile man
+               pages upon installation any more, since modern Linux
+               systems don't have /usr/man/cat? anymore (they 
+               typically cache man pages in /var/catman and delete them
+               if they haven't been used in a while, to save on disk
+               space, and because CPU's are fast enough these days that
+               you can get away with this).
+
+       * MCONFIG.in: Add a new makefile variable for the share
+               directory (i.e., /usr/share).  Make an autoconf magic
+               make rule so that $(top_builddir)/util/subst.conf gets
+               rebuilt automatically when necessary.
+
 Mon Jan 19 10:01:39 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * e2fsprogs-1.12.spec: Update spec file in preparation for 1.12

diff --git a/MCONFIG.in b/MCONFIG.in
index 3f26b5e..f675d18 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -18,6 +18,7 @@ man8dir = $(usr_prefix)/man/man8
 cat1dir = $(usr_prefix)/man/cat1
 cat8dir = $(usr_prefix)/man/cat8
 infodir = $(usr_prefix)/info
+sharedir = $(usr_prefix)/share
 
 @SET_MAKE@
 
@@ -133,6 +134,10 @@ $(top_builddir)/lib/substitute_sh: $(top_srcdir)/lib/substitute_sh.in \
                $(top_builddir)/config.status
        (cd $(top_builddir); CONFIG_FILES=lib/substitute_sh ./config.status)
 
+$(top_builddir)/util/subst.conf: $(top_srcdir)/util/subst.conf.in \
+               $(top_builddir)/config.status
+       (cd $(top_builddir); CONFIG_FILES=util/subst.conf ./config.status)
+
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
                $(top_builddir)/config.status
        (cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status)

diff --git a/Makefile.in b/Makefile.in
index 11c92c6..f235517 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,14 +21,14 @@ progs: $(SUBS) all-progs-recursive
 libs: $(SUBS) all-libs-recursive
 
 docs:
-       (cd doc; make libext2fs.info)
+       (cd doc && make libext2fs.info)
 
 install-doc-libs:
-       (cd doc; make install-doc-libs)
+       (cd doc && make install-doc-libs)
 
 install: all-libs-recursive install-progs-recursive \
        install-shlibs-libs-recursive install-doc-libs
-       (export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages)
+#      (export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages)
 
 install-libs: install-libs-recursive
 
@@ -109,7 +109,7 @@ $(srcdir)/.exclude-file:
        echo "$(SRCROOT)/.exclude-file" >> $(srcdir)/.exclude-file
        echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
                >> $(srcdir)/.exclude-file
-       
+
 source_tar_file: $(srcdir)/.exclude-file
        (cd $(srcdir)/..; a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
                $(TAR) -c -h -v -f - \