# HG changeset patch
# User ladanyi
# Date 1125530098 0
# Node ID 3c82a0d9e0e744860f161caf2335f59cf5500721
# Parent  c0fa68014ba005703b4da9659ddf62bcf0d06b72
install docs in $datadir/doc/$PACKAGE

diff -r c0fa68014ba0 -r 3c82a0d9e0e7 Makefile.am
--- a/Makefile.am	Wed Aug 31 23:03:29 2005 +0000
+++ b/Makefile.am	Wed Aug 31 23:14:58 2005 +0000
@@ -6,7 +6,6 @@
 	autopackage/default.apspec.in \
 	config/lx_check_cplex.m4 \
 	config/lx_check_glpk.m4 \
-	config/lx_docdir_suffix.m4 \
 	config/lx_enable_doc.m4 \
 	config/lx_enable_gui.m4
 
diff -r c0fa68014ba0 -r 3c82a0d9e0e7 config/lx_docdir_suffix.m4
--- a/config/lx_docdir_suffix.m4	Wed Aug 31 23:03:29 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-AC_DEFUN([LX_DOCDIR_SUFFIX],
-[
-  AC_ARG_WITH([docsuffix],
-AS_HELP_STRING([--with-docsuffix=DOCSUFFIX], [install the documentation under datadir/doc/DOCSUFFIX]),
-              [], [with_docsuffix=no])
-
-  AC_MSG_CHECKING([for the value of DOCSUFFIX])
-  if test x"$with_docsuffix" != x"no"; then
-    DOCSUFFIX="$with_docsuffix"
-  else
-    DOCSUFFIX="$PACKAGE_TARNAME-$PACKAGE_VERSION"
-  fi
-  AC_MSG_RESULT([$DOCSUFFIX])
-
-  AC_SUBST(DOCSUFFIX)
-])
diff -r c0fa68014ba0 -r 3c82a0d9e0e7 configure.ac
--- a/configure.ac	Wed Aug 31 23:03:29 2005 +0000
+++ b/configure.ac	Wed Aug 31 23:14:58 2005 +0000
@@ -23,7 +23,6 @@
 LX_CHECK_GLPK
 LX_CHECK_CPLEX
 
-LX_DOCDIR_SUFFIX
 LX_ENABLE_DOC
 LX_ENABLE_GUI
 
@@ -77,7 +76,7 @@
 echo
 echo The documentation will be installed in
 echo -n '  '
-eval echo ${datadir}/doc/$DOCSUFFIX.
+eval echo ${datadir}/doc/$PACKAGE.
 echo
 echo '*********************************************************************'
 
diff -r c0fa68014ba0 -r 3c82a0d9e0e7 debian/rules
--- a/debian/rules	Wed Aug 31 23:03:29 2005 +0000
+++ b/debian/rules	Wed Aug 31 23:14:58 2005 +0000
@@ -27,7 +27,7 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	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
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 
 build: build-stamp
diff -r c0fa68014ba0 -r 3c82a0d9e0e7 doc/Makefile.am
--- a/doc/Makefile.am	Wed Aug 31 23:03:29 2005 +0000
+++ b/doc/Makefile.am	Wed Aug 31 23:14:58 2005 +0000
@@ -1,4 +1,4 @@
-htmldir = $(datadir)/doc/$(DOCSUFFIX)/html
+htmldir = $(datadir)/doc/$(PACKAGE)/html
 
 EXTRA_DIST = \
 	html \
diff -r c0fa68014ba0 -r 3c82a0d9e0e7 lemon.spec.in
--- a/lemon.spec.in	Wed Aug 31 23:03:29 2005 +0000
+++ b/lemon.spec.in	Wed Aug 31 23:14:58 2005 +0000
@@ -39,5 +39,5 @@
 %{_includedir}/%{name}
 %{_libdir}/lib*
 %{_libdir}/pkgconfig/lemon.pc
-%doc %{_datadir}/doc/%{name}-%{version}
+%doc %{_datadir}/doc/%{name}
 %doc AUTHORS COPYING LICENSE NEWS README