* Got rid of --enable-plain-docdir : just let packagers take care

  of this if they want to.

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@277 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/Makefile.am b/Makefile.am
index 133ba8995ac463f6cbbbfc7ad4dda2db29c38b9a..3c9345fb896dfaf863fce1f5f27873ec6662425b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,6 @@
 
 SUBDIRS=src tests doc rpm debian
 
-## decide on appending version to installed doc dir
-if PLAIN_DOCDIR
-DOCROOTDIR=$(prefix)/share/doc/$(PACKAGE)
-else
-DOCROOTDIR=$(prefix)/share/doc/${PACKAGE}-${VERSION}
-endif
-docdir = $(DOCROOTDIR)
-
 ## install the following extra data with docs
 doc_DATA = ChangeLog ChangeLogOld NEWS README COPYING.LESSER
 

diff --git a/NEWS b/NEWS
index 2c1ec63b9527d472db3cb025322b75b0a192fcea..e99553b56f7845f9df7574931aefeb97456144cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 The following changes will be in Check 0.9.4
 
+Got rid of debian/ directory for building .debs.  We should let Debian
+handle this.
+
 Updated GNU Build System to use modern Autotools.
 
 Fixed sourceforge bug #1327225, Two teardown checked fixtures segfaults.

diff --git a/configure.ac b/configure.ac
index 50873200432bf468847aacae118f78e65e9e5a88..c1c2e305cec7cc1c6fa2156bd082e1abe7730704 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,16 +48,6 @@ esac], [enable_timeout_tests=true ])
 
 AM_CONDITIONAL(NO_TIMEOUT_TESTS, test x"$enable_timeout_tests" = "xfalse")
 
-AC_ARG_ENABLE(plain_docdir,
-[  --enable-plain-docdir        don't append version information to docdir],
-[case "${enableval}" in
-  yes) plain_docdir=true ;;
-  no)  plain_docdir=false ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for --enable-plain-docdir) ;;
-esac], [plain_docdir=false ])
-
-AM_CONDITIONAL(PLAIN_DOCDIR, test x"$plain_docdir" = "xtrue")
-
 # Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
@@ -116,4 +106,4 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  tests/Makefile])
 
-AC_OUTPUT
\ No newline at end of file
+AC_OUTPUT

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 60fa7ef821ee92c8cdc414b15f31c8aff96bd54d..e2bcc8327e53924b84a15edce758a33a4faa3126 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,12 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-if PLAIN_DOCDIR
-DOCROOTDIR=$(prefix)/share/doc/$(PACKAGE)
-else
-DOCROOTDIR=$(prefix)/share/doc/${PACKAGE}-${VERSION}
-endif
-docdir = $(DOCROOTDIR)
-
 SUBDIRS=money
 
 SUFFIXES = .html

diff --git a/doc/money/Makefile.am b/doc/money/Makefile.am
index 42e00df8f873ec0d33ef5c89402e8a78df6b0bbc..8eb6e23bc525e27862d46c9297fd04a363532480 100644 (file)
--- a/doc/money/Makefile.am
+++ b/doc/money/Makefile.am
@@ -1,12 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-if PLAIN_DOCDIR
-DOCROOTDIR=$(prefix)/share/doc/$(PACKAGE)
-else
-DOCROOTDIR=$(prefix)/share/doc/${PACKAGE}-${VERSION}
-endif
-exampledocdir=$(DOCROOTDIR)/examples
-
 example_docs =\
        money.h\
        money.c\