1.1 --- a/Makefile.am	Wed Aug 31 23:03:29 2005 +0000
     1.2 +++ b/Makefile.am	Wed Aug 31 23:14:58 2005 +0000
     1.3 @@ -6,7 +6,6 @@
     1.4  	autopackage/default.apspec.in \
     1.5  	config/lx_check_cplex.m4 \
     1.6  	config/lx_check_glpk.m4 \
     1.7 -	config/lx_docdir_suffix.m4 \
     1.8  	config/lx_enable_doc.m4 \
     1.9  	config/lx_enable_gui.m4
    1.10  

     2.1 --- a/config/lx_docdir_suffix.m4	Wed Aug 31 23:03:29 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,16 +0,0 @@
     2.4 -AC_DEFUN([LX_DOCDIR_SUFFIX],
     2.5 -[
     2.6 -  AC_ARG_WITH([docsuffix],
     2.7 -AS_HELP_STRING([--with-docsuffix=DOCSUFFIX], [install the documentation under datadir/doc/DOCSUFFIX]),
     2.8 -              [], [with_docsuffix=no])
     2.9 -
    2.10 -  AC_MSG_CHECKING([for the value of DOCSUFFIX])
    2.11 -  if test x"$with_docsuffix" != x"no"; then
    2.12 -    DOCSUFFIX="$with_docsuffix"
    2.13 -  else
    2.14 -    DOCSUFFIX="$PACKAGE_TARNAME-$PACKAGE_VERSION"
    2.15 -  fi
    2.16 -  AC_MSG_RESULT([$DOCSUFFIX])
    2.17 -
    2.18 -  AC_SUBST(DOCSUFFIX)
    2.19 -])

     3.1 --- a/configure.ac	Wed Aug 31 23:03:29 2005 +0000
     3.2 +++ b/configure.ac	Wed Aug 31 23:14:58 2005 +0000
     3.3 @@ -23,7 +23,6 @@
     3.4  LX_CHECK_GLPK
     3.5  LX_CHECK_CPLEX
     3.6  
     3.7 -LX_DOCDIR_SUFFIX
     3.8  LX_ENABLE_DOC
     3.9  LX_ENABLE_GUI
    3.10  
    3.11 @@ -77,7 +76,7 @@
    3.12  echo
    3.13  echo The documentation will be installed in
    3.14  echo -n '  '
    3.15 -eval echo ${datadir}/doc/$DOCSUFFIX.
    3.16 +eval echo ${datadir}/doc/$PACKAGE.
    3.17  echo
    3.18  echo '*********************************************************************'
    3.19  

     4.1 --- a/debian/rules	Wed Aug 31 23:03:29 2005 +0000
     4.2 +++ b/debian/rules	Wed Aug 31 23:14:58 2005 +0000
     4.3 @@ -27,7 +27,7 @@
     4.4  config.status: configure
     4.5  	dh_testdir
     4.6  	# Add here commands to configure the package.
     4.7 -	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-docsuffix=lemon
     4.8 +	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
     4.9  
    4.10  
    4.11  build: build-stamp

     5.1 --- a/doc/Makefile.am	Wed Aug 31 23:03:29 2005 +0000
     5.2 +++ b/doc/Makefile.am	Wed Aug 31 23:14:58 2005 +0000
     5.3 @@ -1,4 +1,4 @@
     5.4 -htmldir = $(datadir)/doc/$(DOCSUFFIX)/html
     5.5 +htmldir = $(datadir)/doc/$(PACKAGE)/html
     5.6  
     5.7  EXTRA_DIST = \
     5.8  	html \

     6.1 --- a/lemon.spec.in	Wed Aug 31 23:03:29 2005 +0000
     6.2 +++ b/lemon.spec.in	Wed Aug 31 23:14:58 2005 +0000
     6.3 @@ -39,5 +39,5 @@
     6.4  %{_includedir}/%{name}
     6.5  %{_libdir}/lib*
     6.6  %{_libdir}/pkgconfig/lemon.pc
     6.7 -%doc %{_datadir}/doc/%{name}-%{version}
     6.8 +%doc %{_datadir}/doc/%{name}
     6.9  %doc AUTHORS COPYING LICENSE NEWS README