Man pages installed by 'make install'. Redhat package with man pages

diff --git a/Makefile.am b/Makefile.am
index e23d086..d9ba944 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,10 @@
-## $Id: Makefile.am,v 1.6 2002-09-11 20:27:52 adam Exp $
+## $Id: Makefile.am,v 1.7 2002-09-25 09:50:20 adam Exp $
 
 AUTOMAKE_OPTIONS=foreign
 
 EXTRA_DIST= README CHANGELOG 
 
-SUBDIRS=util bfile dfa dict isams isamb isamc isam rset recctrl tab index test
-DIST_SUBDIRS=$(SUBDIRS) include doc
+SUBDIRS=util bfile dfa dict isams isamb isamc isam rset recctrl tab index test include doc
 
 SPEC_FILE=$(PACKAGE).spec
 

diff --git a/configure.in b/configure.in
index abdd37c..94845a9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1995-2002
-dnl $Id: configure.in,v 1.49 2002-09-18 21:01:14 adam Exp $
+dnl $Id: configure.in,v 1.50 2002-09-25 09:50:20 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AM_INIT_AUTOMAKE(idzebra,1.3.3)
@@ -23,7 +23,7 @@ AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
 ],[
    AC_MSG_CHECKING(for docbookx.dtd)
    for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
-         /usr/share/sgml/docbook/xml-dtd-4.1.2 \
+         /usr/share/sgml/docbook/xml-dtd-4.1.2* \
          /usr/share/sgml/docbook/xml-dtd-4.1 \
          /usr/share/sgml/docbook/dtd/xml/4.0 \
            /usr/lib/sgml/dtd/docbook-xml 
@@ -47,8 +47,7 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
 ],[
    AC_MSG_CHECKING(for docbook.dsl)
    for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.64 \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \
+            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
             /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
    do
      if test -f $d/html/docbook.dsl; then

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 93b7d0b..671ede1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.13 2002-09-19 21:06:50 adam Exp $
+## $Id: Makefile.am,v 1.14 2002-09-25 09:50:20 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 doc_DATA = zebra.html zebra.pdf
@@ -20,7 +20,8 @@ XMLFILES = \
  server.xml \
  recordmodel.xml \
  license.xml \
- indexdata.xml
+ indexdata.xml \
+ zebraidx-options.xml
 
 EXTRA_DIST = $(SUPPORTFILES) $(XMLFILES) zebra.pdf \
  $(man_MANS) zebraidx-man.sgml zebrasrv-man.sgml

diff --git a/zebra.spec b/zebra.spec
index aeb579b..8348615 100644 (file)
--- a/zebra.spec
+++ b/zebra.spec
@@ -28,14 +28,16 @@ CFLAGS="$RPM_OPT_FLAGS" \
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
-rm -fr $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/usr install
-cd doc; make prefix=$RPM_BUILD_ROOT/usr install
+rm -fr ${RPM_BUILD_ROOT}
+make prefix=${RPM_BUILD_ROOT}/usr mandir=${RPM_BUILD_ROOT}/usr/share/man install
+
+%clean
+rm -fr ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
 %doc README LICENSE.zebra CHANGELOG 
 %config /usr/share/idzebra/tab
-/usr/bin/zebrasrv
-/usr/bin/zebraidx
+/usr/bin/*
 /usr/share/doc/idzebra
+/usr/share/man/*/*