Changeset 1671:3c82a0d9e0e7 in lemon-0.x

Timestamp:

09/01/05 01:14:58 (18 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2187

Message:

install docs in $datadir/doc/$PACKAGE

Files:

• Makefile.am (modified) (1 diff)
• config/lx_docdir_suffix.m4 (deleted)
• configure.ac (modified) (2 diffs)
• debian/rules (modified) (1 diff)
• doc/Makefile.am (modified) (1 diff)
• lemon.spec.in (modified) (1 diff)

Makefile.am

@@ -7 +7 @@
         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

configure.ac

@@ -24 +24 @@
 LX_CHECK_CPLEX
 
-LX_DOCDIR_SUFFIX
 LX_ENABLE_DOC
 LX_ENABLE_GUI
@@ -78 +77 @@
 echo The documentation will be installed in
 echo -n '  '
-eval echo ${datadir}/doc/$DOCSUFFIX.
+eval echo ${datadir}/doc/$PACKAGE.
 echo
 echo '*********************************************************************'

debian/rules

@@ -28 +28 @@
         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
 
 

doc/Makefile.am

@@ -1 @@
-htmldir = $(datadir)/doc/$(DOCSUFFIX)/html
+htmldir = $(datadir)/doc/$(PACKAGE)/html
 
 EXTRA_DIST = \

lemon.spec.in

@@ -40 +40 @@
 %{_libdir}/lib*
 %{_libdir}/pkgconfig/lemon.pc
-%doc %{_datadir}/doc/%{name}-%{version}
+%doc %{_datadir}/doc/%{name}
 %doc AUTHORS COPYING LICENSE NEWS README