From dd6d3877b189402db50c44457e9d963c7bc9577f Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sat, 10 Nov 2007 12:57:22 +0000 Subject: [PATCH] New style AC_INIT, autofoo cleanups. SVN revision: 32536 --- BlueSteel/Makefile.am | 4 +--- BrushedMetal-Tigert/Makefile.am | 4 +--- Ganymede/Makefile.am | 4 +--- ShinyMetal/Makefile.am | 4 +--- configure.in | 27 +++++++++++++-------------- winter/Makefile.am | 4 +--- 6 files changed, 18 insertions(+), 29 deletions(-) diff --git a/BlueSteel/Makefile.am b/BlueSteel/Makefile.am index 7b850e8..239cd4e 100644 --- a/BlueSteel/Makefile.am +++ b/BlueSteel/Makefile.am @@ -3,12 +3,10 @@ AUTOMAKE_OPTIONS = foreign THEME = BlueSteel THEME_FILES = $(THEME).etheme -ethemedir = $(datadir)/themes - BUILT_SOURCES = $(THEME).etheme EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES) -THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME) +THEME_DIR = $(DESTDIR)$(datadir)/e16/themes/$(THEME) install-data-local: $(mkinstalldirs) $(THEME_DIR) diff --git a/BrushedMetal-Tigert/Makefile.am b/BrushedMetal-Tigert/Makefile.am index 0df35e7..f0d8da2 100644 --- a/BrushedMetal-Tigert/Makefile.am +++ b/BrushedMetal-Tigert/Makefile.am @@ -3,12 +3,10 @@ AUTOMAKE_OPTIONS = foreign THEME = BrushedMetal-Tigert THEME_FILES = $(THEME).etheme -ethemedir = $(datadir)/themes - BUILT_SOURCES = $(THEME).etheme EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES) -THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME) +THEME_DIR = $(DESTDIR)$(datadir)/e16/themes/$(THEME) install-data-local: $(mkinstalldirs) $(THEME_DIR) diff --git a/Ganymede/Makefile.am b/Ganymede/Makefile.am index 843f13c..8f90c81 100644 --- a/Ganymede/Makefile.am +++ b/Ganymede/Makefile.am @@ -3,12 +3,10 @@ AUTOMAKE_OPTIONS = foreign THEME = Ganymede THEME_FILES = $(THEME).etheme -ethemedir = $(datadir)/themes - BUILT_SOURCES = $(THEME).etheme EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES) -THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME) +THEME_DIR = $(DESTDIR)$(datadir)/e16/themes/$(THEME) install-data-local: $(mkinstalldirs) $(THEME_DIR) diff --git a/ShinyMetal/Makefile.am b/ShinyMetal/Makefile.am index 95f2786..9cea976 100644 --- a/ShinyMetal/Makefile.am +++ b/ShinyMetal/Makefile.am @@ -3,12 +3,10 @@ AUTOMAKE_OPTIONS = foreign THEME = ShinyMetal THEME_FILES = $(THEME).etheme -ethemedir = $(datadir)/themes - BUILT_SOURCES = $(THEME).etheme EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES) -THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME) +THEME_DIR = $(DESTDIR)$(datadir)/e16/themes/$(THEME) install-data-local: $(mkinstalldirs) $(THEME_DIR) diff --git a/configure.in b/configure.in index 998329f..7c5a05d 100644 --- a/configure.in +++ b/configure.in @@ -1,30 +1,29 @@ -AC_INIT(configure.in) +m4_define([pkg_version], [0.16.8.0.2]) +dnl 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])) -AM_INIT_AUTOMAKE(e16-themes, 0.16.8.0.1) -AM_MAINTAINER_MODE +AC_INIT(e16-themes, [pkg_ver_rev], [enlightenment-devel@lists.sourceforge.net]) +AM_INIT_AUTOMAKE([foreign]) -THEMES="BlueSteel BrushedMetal-Tigert Ganymede ShinyMetal" +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 - prefix="/usr/local" + prefix=$ac_default_prefix fi if test "x$exec_prefix" = "xNONE"; then exec_prefix=$prefix fi +AM_MAINTAINER_MODE + AC_PROG_MAKE_SET AC_PROG_INSTALL -AC_ARG_ENABLE(fsstd, - [ --enable-fsstd install files following FSSTD [default=yes]], ,enable_fsstd=yes) - -if test "x$enable_fsstd" != "xyes"; then - datadir=${prefix} -fi -ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16` -AC_SUBST(ENLIGHTENMENT_ROOT) - +THEMES="BlueSteel BrushedMetal-Tigert Ganymede ShinyMetal" AC_SUBST(THEMES) AC_OUTPUT([ diff --git a/winter/Makefile.am b/winter/Makefile.am index 2ae34c3..4f853b2 100644 --- a/winter/Makefile.am +++ b/winter/Makefile.am @@ -3,12 +3,10 @@ AUTOMAKE_OPTIONS = foreign THEME = winter THEME_FILES = $(THEME).etheme -ethemedir = $(datadir)/themes - BUILT_SOURCES = $(THEME).etheme EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES) -THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME) +THEME_DIR = $(DESTDIR)$(datadir)/e16/themes/$(THEME) install-data-local: $(mkinstalldirs) $(THEME_DIR)