# HG changeset patch # User js # Date 1158593519 25200 # Node ID d127b22eb601bb5b7fc874ac21644384e4bd6771 # Parent 78eaf8b878990273a9a21d7a90f7fded418de5d2 [svn] Add BMP_RCPATH to configure.ac and -DBMP_RCPATH=$(BMP_RCPATH\) diff -r 78eaf8b87899 -r d127b22eb601 ChangeLog --- a/ChangeLog Mon Sep 18 08:24:01 2006 -0700 +++ b/ChangeLog Mon Sep 18 08:31:59 2006 -0700 @@ -1,3 +1,13 @@ +2006-09-18 15:24:01 +0000 Jonathan Schleifer + revision [62] + @GTK_CFLAGS@ replaced with $(GTK_CFLAGS). + (Hey, this isn't a Makefile.in!) + + + Changes: Modified: + +1 -1 trunk/src/cdaudio/Makefile + + 2006-09-18 11:15:18 +0000 William Pitcock revision [60] - last one diff -r 78eaf8b87899 -r d127b22eb601 configure.ac --- a/configure.ac Mon Sep 18 08:24:01 2006 -0700 +++ b/configure.ac Mon Sep 18 08:31:59 2006 -0700 @@ -1045,6 +1045,8 @@ AC_SUBST(beepdir) AC_SUBST(plugindir) +AC_SUBST(BMP_RCPATH) + AC_SUBST(EFFECT_PLUGINS) AC_SUBST(GENERAL_PLUGINS) AC_SUBST(INPUT_PLUGINS) diff -r 78eaf8b87899 -r d127b22eb601 src/cdaudio/Makefile --- a/src/cdaudio/Makefile Mon Sep 18 08:24:01 2006 -0700 +++ b/src/cdaudio/Makefile Mon Sep 18 08:31:59 2006 -0700 @@ -9,6 +9,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../.. -DBMP_RCPATH=\"$(BMP_RCPATH)\" include ../../mk/objective.mk diff -r 78eaf8b87899 -r d127b22eb601 src/cdaudio/cdinfo.c --- a/src/cdaudio/cdinfo.c Mon Sep 18 08:24:01 2006 -0700 +++ b/src/cdaudio/cdinfo.c Mon Sep 18 08:31:59 2006 -0700 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #include "cdinfo.h" #include