org.handhelds.familiar/packages/mp3blaster/mp3blaster-3.1.3/includedir.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- mp3blaster-3.1.3/src/Makefile.am~includedir
   7 +++ mp3blaster-3.1.3/src/Makefile.am
   8 @@ -36,7 +36,7 @@
   9  mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
  10  mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
  11  mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
  12 -INCLUDES               = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
  13 +INCLUDES               = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
  14  mp3blaster_LDADD       = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
  15  EXTRA_DIST = FILES
  16  CXXFLAGS       = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
  17 --- mp3blaster-3.1.3/mpegsound/Makefile.am~includedir
  18 +++ mp3blaster-3.1.3/mpegsound/Makefile.am
  19 @@ -11,5 +11,5 @@
  20
  21  noinst_HEADERS         = mpegsound.h mpegsound_locals.h
  22
  23 -INCLUDES                = -I$(srcdir) -I$(includedir)
  24 +INCLUDES                = -I$(srcdir)
  25  CXXFLAGS                = @CXXFLAGS@ @NAS_CFLAGS@
  26 --- mp3blaster-3.1.3/nmixer/Makefile.am~includedir
  27 +++ mp3blaster-3.1.3/nmixer/Makefile.am
  28 @@ -2,7 +2,7 @@
  29  nmixer_SOURCES = main.cc
  30  nmixer_DEPENDENCIES = @LIBNMIXER@
  31  LDADD           = @LIBNMIXER@ @NCURSES_LIBS@
  32 -INCLUDES               = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
  33 +INCLUDES               = -I$(srcdir)
  34  noinst_LIBRARIES = libnmixer.a
  35  libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
  36                        getopt.c getopt1.c getopt.h
  37 --- mp3blaster-3.1.3/src/Makefile.in~includedir
  38 +++ mp3blaster-3.1.3/src/Makefile.in
  39 @@ -86,7 +86,7 @@
  40  mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
  41  mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
  42  mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
  43 -INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
  44 +INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
  45  mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
  46  EXTRA_DIST = FILES
  47  CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
  48 --- mp3blaster-3.1.3/nmixer/Makefile.in~includedir
  49 +++ mp3blaster-3.1.3/nmixer/Makefile.in
  50 @@ -79,7 +79,7 @@
  51  nmixer_SOURCES = main.cc
  52  nmixer_DEPENDENCIES = @LIBNMIXER@
  53  LDADD = @LIBNMIXER@ @NCURSES_LIBS@
  54 -INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
  55 +INCLUDES = -I$(srcdir)
  56  noinst_LIBRARIES = libnmixer.a
  57  libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h                       getopt.c getopt1.c getopt.h
  58
  59 --- mp3blaster-3.1.3/mpegsound/Makefile.in~includedir
  60 +++ mp3blaster-3.1.3/mpegsound/Makefile.in
  61 @@ -82,7 +82,7 @@
  62
  63  noinst_HEADERS = mpegsound.h mpegsound_locals.h
  64
  65 -INCLUDES = -I$(srcdir) -I$(includedir)
  66 +INCLUDES = -I$(srcdir)
  67  CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@
  68  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  69  CONFIG_HEADER = ../config.h