From 6d2d96f7f7b26ee6a846836b79feff02420f9e7b Mon Sep 17 00:00:00 2001
From: cpickett <cpickett@64e312b2-a51f-0410-8e61-82d0ca0eb02a>
Date: Fri, 13 Oct 2006 03:32:02 +0000
Subject: [PATCH] * Use $(datadir) in Makefile.am's

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@291 64e312b2-a51f-0410-8e61-82d0ca0eb02a
---
 Makefile.am     | 9 ++-------
 configure.ac    | 1 -
 doc/Makefile.am | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3d83913..7be45c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,12 @@
 
 ## run tests after everything else
 
-SUBDIRS = src doc rpm . tests
+SUBDIRS = src doc . tests
 
 ## what to clean
 
 CLEANFILES=*~\
 	$(PACKAGE)-$(VERSION).tar.gz\
-	$(PACKAGE)-$(VERSION).rpm\
 	ChangeLog.bak
 
 ## what additional things to distribute
@@ -16,13 +15,9 @@ CLEANFILES=*~\
 EXTRA_DIST= ChangeLogOld $(m4data_DATA)
 
 ## install docs
-datarootdir = $(prefix)/share
-docdir = $(datarootdir)/doc/$(PACKAGE)
+docdir = $(datadir)/doc/$(PACKAGE)
 doc_DATA = ChangeLog ChangeLogOld NEWS README COPYING.LESSER
 
 ## install check.m4 with AM_PATH_CHECK in it
 m4datadir = $(datadir)/aclocal
 m4data_DATA = check.m4
-
-rpm: dist
-	(cd rpm && ${MAKE} ${AM_MAKEFLAGS} rpm)
diff --git a/configure.ac b/configure.ac
index baeab34..96762da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,6 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile
                  doc/Makefile
-                 doc/money/Makefile
                  src/check.h
                  src/Makefile
                  tests/Makefile])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 17b1f2d..7afe2ea 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = $(sgml_docs) $(example_docs)
 
 ## what to install
 
-docdir = $(prefix)/share/doc/$(PACKAGE)
+docdir = $(datadir)/doc/$(PACKAGE)
 
 # install money example
 
-- 
2.40.0