[Lemon-commits] [lemon_svn] ladanyi: r2187 - in hugo/trunk: . config debian doc

[Lemon SVN]

Author: ladanyi
Date: Thu Sep  1 01:14:58 2005
New Revision: 2187

Removed:
   hugo/trunk/config/lx_docdir_suffix.m4
Modified:
   hugo/trunk/Makefile.am
   hugo/trunk/configure.ac
   hugo/trunk/debian/rules
   hugo/trunk/doc/Makefile.am
   hugo/trunk/lemon.spec.in

Log:
install docs in $datadir/doc/$PACKAGE


Modified: hugo/trunk/Makefile.am
==============================================================================
--- hugo/trunk/Makefile.am	(original)
+++ hugo/trunk/Makefile.am	Thu Sep  1 01:14:58 2005
@@ -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
 

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Thu Sep  1 01:14:58 2005
@@ -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 '*********************************************************************'
 

Modified: hugo/trunk/debian/rules
==============================================================================
--- hugo/trunk/debian/rules	(original)
+++ hugo/trunk/debian/rules	Thu Sep  1 01:14:58 2005
@@ -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

Modified: hugo/trunk/doc/Makefile.am
==============================================================================
--- hugo/trunk/doc/Makefile.am	(original)
+++ hugo/trunk/doc/Makefile.am	Thu Sep  1 01:14:58 2005
@@ -1,4 +1,4 @@
-htmldir = $(datadir)/doc/$(DOCSUFFIX)/html
+htmldir = $(datadir)/doc/$(PACKAGE)/html
 
 EXTRA_DIST = \
 	html \

Modified: hugo/trunk/lemon.spec.in
==============================================================================
--- hugo/trunk/lemon.spec.in	(original)
+++ hugo/trunk/lemon.spec.in	Thu Sep  1 01:14:58 2005
@@ -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