diff options
author | Eric Sandall | 2010-10-06 16:14:55 -0700 |
---|---|---|
committer | Eric Sandall | 2010-10-06 16:17:20 -0700 |
commit | f52fba297a75af09e440146d7674434d0f1626b8 (patch) | |
tree | 73bcb02c092eb1b514ef828f139fe16c8b223fdf | |
parent | 2ad012001ed6ffcaf9f5c41bff3688522d555d98 (diff) |
libcanberra: Fix make 3.82 syntax issues
Still fails to install with:
I/O warning : failed to load external entity
"./data/libcanberra.schemas"
Failed to open `./data/libcanberra.schemas': No such file or directory
make[2]: *** [install-data-local] Error 1
make[2]: Leaving directory `/usr/src/libcanberra-0.23'
Fixed with a second modification to make.patch:
$ find /tmp/libcanberra-0.23 -name libcanberra.schemas
/tmp/libcanberra-0.23/libcanberra.schemas
libcanberra.schemas is not under data/
-rw-r--r-- | gnome2-libs/libcanberra/HISTORY | 4 | ||||
-rwxr-xr-x | gnome2-libs/libcanberra/PRE_BUILD | 5 | ||||
-rw-r--r-- | gnome2-libs/libcanberra/make.patch | 20 |
3 files changed, 29 insertions, 0 deletions
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY index 7dd91a5526..46ff1cf1ec 100644 --- a/gnome2-libs/libcanberra/HISTORY +++ b/gnome2-libs/libcanberra/HISTORY @@ -1,3 +1,7 @@ +2010-10-06 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Apply make.patch + * make.patch: Fix make 3.82 syntax issues + 2010-02-21 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.23 diff --git a/gnome2-libs/libcanberra/PRE_BUILD b/gnome2-libs/libcanberra/PRE_BUILD new file mode 100755 index 0000000000..6c90aa890c --- /dev/null +++ b/gnome2-libs/libcanberra/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && + +message "${MESSAGE_COLOR}Applying make 3.82 syntax patch...${DEFAULT_COLOR}" && +patch "$SOURCE_DIRECTORY"/Makefile.in \ + "$SPELL_DIRECTORY"/make.patch diff --git a/gnome2-libs/libcanberra/make.patch b/gnome2-libs/libcanberra/make.patch new file mode 100644 index 0000000000..6545d0a29d --- /dev/null +++ b/gnome2-libs/libcanberra/make.patch @@ -0,0 +1,20 @@ +diff -Naur libcanberra-0.23.orig/Makefile.in libcanberra-0.23/Makefile.in +--- libcanberra-0.23.orig/Makefile.in 2010-10-06 16:12:23.227000071 -0700 ++++ libcanberra-0.23/Makefile.in 2010-10-06 16:16:31.841999901 -0700 +@@ -936,11 +936,11 @@ + + + @GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@install-data-local: +-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ if test -z "$(DESTDIR)" ; then \ +-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ for p in $(schemas_DATA) ; do \ +-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ +-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ done \ +-@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ fi ++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ if test -z "$(DESTDIR)" ; then \ ++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ for p in $(schemas_DATA) ; do \ ++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \ ++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ done \ ++@GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@ fi + @GCONF_SCHEMAS_INSTALL_FALSE@@HAVE_GTK_TRUE@install-data-local: + @HAVE_GTK_FALSE@install-data-local: + |