# HG changeset patch # User Yoshiki Yazawa # Date 1227546896 -32400 # Node ID d834d2df8d7c52ca2baa69a91c64e32a3c981967 # Parent bb0d3b3ac12adb43393e9ad9bf7a51d1bdb27674 override includesibdir for compatibility. diff -r bb0d3b3ac12a -r d834d2df8d7c buildsys.mk.in --- a/buildsys.mk.in Tue Nov 25 00:23:50 2008 +0900 +++ b/buildsys.mk.in Tue Nov 25 02:14:56 2008 +0900 @@ -67,7 +67,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ includedir = @includedir@ -includesubdir ?= audacious +includesubdir ?= ${PACKAGE} mandir = @mandir@ mansubdir ?= man1 diff -r bb0d3b3ac12a -r d834d2df8d7c src/audacious/Makefile --- a/src/audacious/Makefile Tue Nov 25 00:23:50 2008 +0900 +++ b/src/audacious/Makefile Tue Nov 25 02:14:56 2008 +0900 @@ -149,7 +149,7 @@ ui/playlist.ui \ ui/carbon-menubar.ui -CLEAN = build_stamp.c libaudacious.exe.a +CLEAN = build_stamp.c libaudlegacy.exe.a EXT_DEPS = ../libguess/libguess.a ../libSAD/${LIB_PREFIX}SAD${LIB_SUFFIX} ifeq ($(USE_EGGSM),yes) @@ -160,6 +160,8 @@ include ../../buildsys.mk +includesubdir = audacious + ifeq ($(USE_DBUS),yes) CPPFLAGS += -I../libaudclient DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h diff -r bb0d3b3ac12a -r d834d2df8d7c src/libaudclient/Makefile --- a/src/libaudclient/Makefile Tue Nov 25 00:23:50 2008 +0900 +++ b/src/libaudclient/Makefile Tue Nov 25 02:14:56 2008 +0900 @@ -9,6 +9,8 @@ include ../../buildsys.mk include ../../extra.mk +includesubdir = audacious + pre-depend: cd ../audacious; ${MAKE} ${MFLAGS} dbus-client-bindings.h diff -r bb0d3b3ac12a -r d834d2df8d7c src/libaudutil/Makefile --- a/src/libaudutil/Makefile Tue Nov 25 00:23:50 2008 +0900 +++ b/src/libaudutil/Makefile Tue Nov 25 02:14:56 2008 +0900 @@ -9,6 +9,8 @@ include ../../buildsys.mk include ../../extra.mk +includesubdir = audacious + CPPFLAGS = ${LIB_CPPFLAGS} ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../.. CFLAGS += ${LIB_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} diff -r bb0d3b3ac12a -r d834d2df8d7c src/libeggsmclient/Makefile --- a/src/libeggsmclient/Makefile Tue Nov 25 00:23:50 2008 +0900 +++ b/src/libeggsmclient/Makefile Tue Nov 25 02:14:56 2008 +0900 @@ -17,6 +17,8 @@ include ../../buildsys.mk include ../../extra.mk +includesubdir = audacious + CFLAGS += ${INCLUDES} ${GLIB_CFLAGS} ${GTK_CFLAGS} -I../.. -I. ${platform_defines} LIBS += ${GLIB_LIBS} ${GTK_LIBS} ${platform_libs} CPPFLAGS += ${CFLAGS} diff -r bb0d3b3ac12a -r d834d2df8d7c src/libid3tag/Makefile --- a/src/libid3tag/Makefile Tue Nov 25 00:23:50 2008 +0900 +++ b/src/libid3tag/Makefile Tue Nov 25 02:14:56 2008 +0900 @@ -27,6 +27,8 @@ include ../../buildsys.mk include ../../extra.mk +includesubdir = audacious + CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS} ${GTK_CFLAGS} \ ${MOWGLI_CFLAGS} ${LIBMCS_CFLAGS}