# # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- mp3blaster-3.1.3/src/Makefile.am~includedir +++ mp3blaster-3.1.3/src/Makefile.am @@ -36,7 +36,7 @@ mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@ mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a -INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir) +INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@ EXTRA_DIST = FILES CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\" --- mp3blaster-3.1.3/mpegsound/Makefile.am~includedir +++ mp3blaster-3.1.3/mpegsound/Makefile.am @@ -11,5 +11,5 @@ noinst_HEADERS = mpegsound.h mpegsound_locals.h -INCLUDES = -I$(srcdir) -I$(includedir) +INCLUDES = -I$(srcdir) CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ --- mp3blaster-3.1.3/nmixer/Makefile.am~includedir +++ mp3blaster-3.1.3/nmixer/Makefile.am @@ -2,7 +2,7 @@ nmixer_SOURCES = main.cc nmixer_DEPENDENCIES = @LIBNMIXER@ LDADD = @LIBNMIXER@ @NCURSES_LIBS@ -INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir) +INCLUDES = -I$(srcdir) noinst_LIBRARIES = libnmixer.a libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \ getopt.c getopt1.c getopt.h --- mp3blaster-3.1.3/src/Makefile.in~includedir +++ mp3blaster-3.1.3/src/Makefile.in @@ -86,7 +86,7 @@ mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@ mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a -INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir) +INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@ EXTRA_DIST = FILES CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\" --- mp3blaster-3.1.3/nmixer/Makefile.in~includedir +++ mp3blaster-3.1.3/nmixer/Makefile.in @@ -79,7 +79,7 @@ nmixer_SOURCES = main.cc nmixer_DEPENDENCIES = @LIBNMIXER@ LDADD = @LIBNMIXER@ @NCURSES_LIBS@ -INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir) +INCLUDES = -I$(srcdir) noinst_LIBRARIES = libnmixer.a libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h getopt.c getopt1.c getopt.h --- mp3blaster-3.1.3/mpegsound/Makefile.in~includedir +++ mp3blaster-3.1.3/mpegsound/Makefile.in @@ -82,7 +82,7 @@ noinst_HEADERS = mpegsound.h mpegsound_locals.h -INCLUDES = -I$(srcdir) -I$(includedir) +INCLUDES = -I$(srcdir) CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h