diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-13 21:50:46 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-13 21:50:46 +0200 |
| commit | b827af3bb41afcf34ac3f6d667e46d902b4731d8 (patch) | |
| tree | 65b343da905832dd85940bca98b03f981e9cf6fe /package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch | |
| parent | 9554403ad0b81f29dd4ee1404de755aa5b72cac5 (diff) | |
| parent | 157526cb051ef24de552082c3444bde1a81a40e4 (diff) | |
| download | buildroot-novena-b827af3bb41afcf34ac3f6d667e46d902b4731d8.tar.gz buildroot-novena-b827af3bb41afcf34ac3f6d667e46d902b4731d8.zip | |
Merge branch 'autotools-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch')
| -rw-r--r-- | package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch b/package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch new file mode 100644 index 000000000..8d55218bb --- /dev/null +++ b/package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch @@ -0,0 +1,29 @@ +Aumix's src/Makefile.am incorrect adds @includedir@ to the list of +include paths and @libdir@ to the list of libraries paths. This is +incorrect, as @includedir@ and @libdir@ are respectively /usr/include +and /usr/lib, even in cross-compilation mode. + +At the same time, use AM_CFLAGS instead of CFLAGS, as is done on the +similar patch found in OpenEmbedded. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + src/Makefile.am | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +Index: aumix-2.8/src/Makefile.am +=================================================================== +--- aumix-2.8.orig/src/Makefile.am ++++ aumix-2.8/src/Makefile.am +@@ -7,9 +7,8 @@ + mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h \ + mouse.h play.xpm record.xpm + localedir = $(datadir)/locale +-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@ +-CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ +-LDADD = -L@libdir@ ++INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" ++AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ + LIBS = @LIBS@ @GTK_LIBS@ @INTLLIBS@ + DEFS = @DEFS@ + |