diff options
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 2 |
3 files changed, 1 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 6e021751b..76e9d7efa 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,6 @@ AC_CONFIG_FILES([Makefile doc/Makefile doc/examples/Makefile doc/hacker-guide/Makefile - doc/user-guide/Makefile extras/Makefile extras/init.d/Makefile extras/init.d/glusterfs-server.plist @@ -134,26 +133,6 @@ AC_CANONICAL_HOST AC_PROG_CC AC_PROG_LIBTOOL -# texinfo check -AC_CHECK_PROG([INFO], [makeinfo], [yes], [no]) -if test "x$INFO" = "xno"; then - AC_MSG_WARN([ -*** Makeinfo is missing. Info documentation will not be built.]) - BUILD_INFO= -else - BUILD_INFO=user-guide - case "$INFO" in - */missing\ makeinfo*) - BUILD_INFO= - AC_MSG_WARN([ -*** Makeinfo is missing. Info documentation will not be built.]) - ;; - *) - esac -fi -AC_SUBST(INFO) -AC_SUBST(BUILD_INFO) - # LEX needs a check AC_PROG_LEX if test "x${LEX}" != "xflex" -a "x${FLEX}" != "xlex"; then diff --git a/doc/Makefile.am b/doc/Makefile.am index 0934c1c27..807c72a5a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ EXTRA_DIST = glusterfs.vol.sample glusterfsd.vol.sample glusterfs.8 \ porting_guide.txt authentication.txt coding-standard.pdf get_put_api_using_xattr.txt \ translator-options.txt mac-related-xattrs.txt replicate.pdf -SUBDIRS = examples hacker-guide $(BUILD_INFO) +SUBDIRS = examples hacker-guide voldir = $(sysconfdir)/glusterfs vol_DATA = glusterfs.vol.sample glusterfsd.vol.sample diff --git a/glusterfs.spec.in b/glusterfs.spec.in index ba1a0a668..148f18888 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -153,9 +153,7 @@ This package provides the development libraries. %_prefix/sbin/glusterfs %_prefix/sbin/glusterfsd %_mandir/man8/glusterfs.8.gz -%_infodir/user-guide.info.gz %config %_sysconfdir/init.d/glusterfsd -%exclude %_infodir/dir %if %with_client /sbin/mount.glusterfs |