From 7502c79ffa1b29cfdea6dd19b421505c65b281ea Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Thu, 8 Nov 2007 20:22:25 +0000
Subject: [PATCH] New style AC_INIT, autofoo cleanups.

SVN revision: 32498
---
 E-docs/Makefile.am |  2 +-
 Makefile.am        |  2 +-
 configure.in       | 29 +++++++++--------------------
 e16-docs.spec.in   |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/E-docs/Makefile.am b/E-docs/Makefile.am
index f5d963e..6225b26 100644
--- a/E-docs/Makefile.am
+++ b/E-docs/Makefile.am
@@ -1,4 +1,4 @@
-edocdatadir = $(ENLIGHTENMENT_ROOT)/E-docs
+edocdatadir = $(datadir)/e16/E-docs
 
 edocdata_DATA = @edocdata@
 
diff --git a/Makefile.am b/Makefile.am
index 11f0ede..55828da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 MAINTAINERCLEANFILES = aclocal.m4 configure install-sh missing \
-		       Makefile.in
+		       Makefile.in E-docs/Makefile.in
 
 SUBDIRS = E-docs
 
diff --git a/configure.in b/configure.in
index 51df263..4a033a4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,21 +1,14 @@
-AC_INIT(configure.in)
+m4_define([pkg_version],  [0.16.8.0.1])
+m4_define([pkg_revision], [0.00])
+m4_define([pkg_ver_rev],  m4_ifdef([pkg_revision], [pkg_version-pkg_revision], [pkg_version]))
+m4_define([rpm_revision], m4_ifdef([pkg_revision], [pkg_revision], [1]))
 
-E_PKG_VERSION=0.16.8.0.1
-E_PKG_REVISION=0.00
-if test "x$E_PKG_REVISION" != "x"; then
-  E_PKG_VER_REV=$E_PKG_VERSION-$E_PKG_REVISION
-  E_RPM_REVISION=$E_PKG_REVISION
-else
-  E_PKG_VER_REV=$E_PKG_VERSION
-  E_RPM_REVISION=1
-fi
+AC_INIT(e16-docs, [pkg_ver_rev], [enlightenment-devel@lists.sourceforge.net])
+AM_INIT_AUTOMAKE([foreign])
 
-AM_INIT_AUTOMAKE(e16-docs, $E_PKG_VER_REV)
-
-AC_DEFINE_UNQUOTED(E_PKG_VERSION, "$E_PKG_VERSION", [Version])
-AC_DEFINE_UNQUOTED(E_PKG_VER_REV, "$E_PKG_VER_REV", [Version, Revision])
-AC_SUBST(E_PKG_VERSION)
-AC_SUBST(E_RPM_REVISION)
+AC_DEFINE(E_PKG_VERSION, ["pkg_version"], [Version])
+AC_SUBST(E_PKG_VERSION,  [pkg_version])
+AC_SUBST(E_RPM_REVISION, [rpm_revision])
 
 dnl reasonable guesses for where stuff is installed
 if test "x$prefix" = "xNONE"; then
@@ -30,10 +23,6 @@ AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-DATADIR=`eval echo ${datadir}`
-ENLIGHTENMENT_ROOT=`eval echo ${DATADIR}/e16`
-AC_SUBST(ENLIGHTENMENT_ROOT)
-
 edocdata=`cd $srcdir/E-docs; ls -1 MAIN *.png *.ttf`
 edocdata=`eval echo $edocdata`
 AC_SUBST(edocdata)
diff --git a/e16-docs.spec.in b/e16-docs.spec.in
index 368b37c..4d0b5e2 100644
--- a/e16-docs.spec.in
+++ b/e16-docs.spec.in
@@ -1,7 +1,7 @@
 Summary:	Documentation for the Enlightenment window manager.
 Name: 		@PACKAGE@
 Version:	@E_PKG_VERSION@
-Release:	@E_RPM_REVISION@%%{?_vendorsuffix:.%{_vendorsuffix}}
+Release:	@E_RPM_REVISION@%{?_vendorsuffix:.%{_vendorsuffix}}
 License:	BSD
 Group:		User Interface/Desktops
 Source:		http://prdownloads.sourceforge.net/enlightenment/%{name}-@VERSION@.tar.gz