changeset 4802:d834d2df8d7c

override includesibdir for compatibility.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 25 Nov 2008 02:14:56 +0900
parents bb0d3b3ac12a
children 20f868cd576b
files buildsys.mk.in src/audacious/Makefile src/libaudclient/Makefile src/libaudutil/Makefile src/libeggsmclient/Makefile src/libid3tag/Makefile
diffstat 6 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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
--- 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
 
--- 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}
 
--- 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}
--- 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}