Enlightenment CVS committal
Author : kwo
Project : e16
Module : edox-data
Dir : e16/edox-data
Modified Files:
Makefile.am configure.in e16-docs.spec.in
Log Message:
New style AC_INIT, autofoo cleanups.
===================================================================
RCS file: /cvs/e/e16/edox-data/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 22 Sep 2007 16:22:40 -0000 1.3
+++ Makefile.am 8 Nov 2007 20:22:25 -0000 1.4
@@ -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
===================================================================
RCS file: /cvs/e/e16/edox-data/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- configure.in 22 Sep 2007 16:22:40 -0000 1.8
+++ configure.in 8 Nov 2007 20:22:25 -0000 1.9
@@ -1,21 +1,14 @@
-AC_INIT(configure.in)
-
-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
-
-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)
+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]))
+
+AC_INIT(e16-docs, [pkg_ver_rev], [EMAIL PROTECTED])
+AM_INIT_AUTOMAKE([foreign])
+
+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
@@ -29,10 +22,6 @@
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`
===================================================================
RCS file: /cvs/e/e16/edox-data/e16-docs.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e16-docs.spec.in 22 Sep 2007 16:22:40 -0000 1.1
+++ e16-docs.spec.in 8 Nov 2007 20:22:25 -0000 1.2
@@ -1,7 +1,7 @@
Summary: Documentation for the Enlightenment window manager.
Name: @PACKAGE@
Version: @E_PKG_VERSION@
-Release: @[EMAIL PROTECTED]:.%{_vendorsuffix}}
+Release: @[EMAIL PROTECTED]:.%{_vendorsuffix}}
License: BSD
Group: User Interface/Desktops
Source: http://prdownloads.sourceforge.net/enlightenment/[EMAIL
PROTECTED]@.tar.gz
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
