New style AC_INIT, autofoo cleanups.

SVN revision: 32498
This commit is contained in:
Kim Woelders 2007-11-08 20:22:25 +00:00
parent 3385458cc0
commit 7502c79ffa
4 changed files with 12 additions and 23 deletions

View File

@ -1,4 +1,4 @@
edocdatadir = $(ENLIGHTENMENT_ROOT)/E-docs
edocdatadir = $(datadir)/e16/E-docs
edocdata_DATA = @edocdata@

View File

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

View File

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

View File

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