# HG changeset patch
# User js
# Date 1158593904 25200
# Node ID e6d2dc95dda1af45f31b3dcc6a026ce0374f7330
# Parent  d127b22eb601bb5b7fc874ac21644384e4bd6771
[svn] Removed BMP_RCPATH from configure.ac, mk/rules.mk.in and Makefiles and added it to config.h via configure.ac

diff -r d127b22eb601 -r e6d2dc95dda1 ChangeLog
--- a/ChangeLog	Mon Sep 18 08:31:59 2006 -0700
+++ b/ChangeLog	Mon Sep 18 08:38:24 2006 -0700
@@ -1,3 +1,13 @@
+2006-09-18 15:31:59 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [64]
+  Add BMP_RCPATH to configure.ac and -DBMP_RCPATH=$(BMP_RCPATH\)
+
+  Changes:        Modified:
+  +2 -0           trunk/configure.ac  
+  +1 -1           trunk/src/cdaudio/Makefile  
+  +0 -1           trunk/src/cdaudio/cdinfo.c  
+
+
 2006-09-18 15:24:01 +0000  Jonathan Schleifer <js@h3c.de>
   revision [62]
   @GTK_CFLAGS@ replaced with $(GTK_CFLAGS).
diff -r d127b22eb601 -r e6d2dc95dda1 configure.ac
--- a/configure.ac	Mon Sep 18 08:31:59 2006 -0700
+++ b/configure.ac	Mon Sep 18 08:38:24 2006 -0700
@@ -1040,13 +1040,13 @@
     AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
 fi
 
+AC_DEFINE(BMP_RCPATH, ".audacious", [Config dir to use])
+
 AC_SUBST(BEEP_DEFINES)
 
 AC_SUBST(beepdir)
 AC_SUBST(plugindir)
 
-AC_SUBST(BMP_RCPATH)
-
 AC_SUBST(EFFECT_PLUGINS)
 AC_SUBST(GENERAL_PLUGINS)
 AC_SUBST(INPUT_PLUGINS)
diff -r d127b22eb601 -r e6d2dc95dda1 mk/rules.mk.in
--- a/mk/rules.mk.in	Mon Sep 18 08:31:59 2006 -0700
+++ b/mk/rules.mk.in	Mon Sep 18 08:38:24 2006 -0700
@@ -78,7 +78,6 @@
 BEEP_PATH ?= @BEEP_PATH@
 BINIO_CFLAGS ?= @BINIO_CFLAGS@
 BINIO_LIBS ?= @BINIO_LIBS@
-BMP_RCPATH ?= @BMP_RCPATH@
 BUILDERS_INCLUDES ?= @BUILDERS_INCLUDES@
 BUILDERS_LDFLAGS ?= @BUILDERS_LDFLAGS@
 BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@
diff -r d127b22eb601 -r e6d2dc95dda1 src/cdaudio/Makefile
--- a/src/cdaudio/Makefile	Mon Sep 18 08:31:59 2006 -0700
+++ b/src/cdaudio/Makefile	Mon Sep 18 08:38:24 2006 -0700
@@ -9,6 +9,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../.. -DBMP_RCPATH=\"$(BMP_RCPATH)\"
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../..
 
 include ../../mk/objective.mk