From d607d56bdbb414b296d39154355eb8f7ead8a156 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sat, 8 May 2004 21:39:37 +0000
Subject: [PATCH] Move some DEFS into config.h.

SVN revision: 10137
---
 configure.in     | 10 ++++++----
 dox/Makefile.am  |  2 --
 eesh/Makefile.am |  2 --
 src/Makefile.am  |  2 --
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index a68d2343..2fef5c63 100644
--- a/configure.in
+++ b/configure.in
@@ -30,10 +30,6 @@ if test "x$ENLIGHTENMENT_RELEASE" != "x"; then
 AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
 fi
 
-AC_SUBST(ENLIGHTENMENT_ROOT)
-AC_SUBST(ENLIGHTENMENT_BIN)
-AC_SUBST(LOCALEDIR)
-
 ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
 
 AC_PROG_CC
@@ -107,6 +103,12 @@ else
 fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
 ENLIGHTENMENT_BIN=`eval echo ${bindir}`
+AC_SUBST(ENLIGHTENMENT_ROOT)
+AC_SUBST(ENLIGHTENMENT_BIN)
+AC_SUBST(LOCALEDIR)
+AC_DEFINE_UNQUOTED(ENLIGHTENMENT_ROOT, "$ENLIGHTENMENT_ROOT", [The installation root directory])
+AC_DEFINE_UNQUOTED(ENLIGHTENMENT_BIN, "$ENLIGHTENMENT_BIN", [The installation bin directory])
+AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR",  [The installation locale directory])
 
 if test "x$enable_sound" = "xyes"; then
 AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD, 1, [libesd.so]),[
diff --git a/dox/Makefile.am b/dox/Makefile.am
index f8a6521a..08102a2c 100644
--- a/dox/Makefile.am
+++ b/dox/Makefile.am
@@ -9,8 +9,6 @@ LDADD = $(TTF_LIBS) $(FNLIB_LIBS) $(IMLIB_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11
 
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(IMLIB_CFLAGS) $(X_CFLAGS)
 
-DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\"
-
 uninstall-local:
 	for i in $(bin_PROGRAMS); do \
 	  rm -f $(exec_prefix)/bin/$$i; \
diff --git a/eesh/Makefile.am b/eesh/Makefile.am
index dbf76c8f..bb3aea74 100644
--- a/eesh/Makefile.am
+++ b/eesh/Makefile.am
@@ -7,8 +7,6 @@ LDADD = $(X_LIBS) -lX11
 
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(X_CFLAGS)
 
-DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
-
 uninstall-local:
 	for i in $(bin_PROGRAMS); do \
 	  rm -f $(exec_prefix)/bin/$$i; \
diff --git a/src/Makefile.am b/src/Makefile.am
index 04df742f..5acf79da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,8 +104,6 @@ LDADD = \
 
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(ESD_CFLAGS) $(IMLIB_CFLAGS) $(X_CFLAGS)
 
-DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\"
-
 install-data-local:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes