diff options
| author | Eric Sandall | 2010-10-06 16:20:35 -0700 |
|---|---|---|
| committer | Eric Sandall | 2010-10-06 16:20:35 -0700 |
| commit | 61a5547d161f978c5c53609e36766bd666a28d93 (patch) | |
| tree | e49e95733d27abadf0a7acfe2861b954b008698e | |
| parent | cc3a46ae646f7354d75155f45a7762f28d88f429 (diff) | |
at-spi: Fixed location of at-spi.schemas
While fixing libcanberra for the make 3.82 syntax issues, noticed it
failed when trying to find libcanberra.schemas. Then looked at
at-spi and noticed it was also failing, but the Makefile did not
make this a hard error.
at-spi.schemas is not under data/, fix Makefile.in
| -rw-r--r-- | gnome2-libs/at-spi/HISTORY | 1 | ||||
| -rw-r--r-- | gnome2-libs/at-spi/make.patch | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gnome2-libs/at-spi/HISTORY b/gnome2-libs/at-spi/HISTORY index d9d6247354..00a223d2bf 100644 --- a/gnome2-libs/at-spi/HISTORY +++ b/gnome2-libs/at-spi/HISTORY @@ -3,6 +3,7 @@ Quote paths and provide patch message * INSTALL: Fails with multiple make jobs * make.patch: Added + Updated for incorrect location of at-spi.schemas 2010-06-13 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.30.1 diff --git a/gnome2-libs/at-spi/make.patch b/gnome2-libs/at-spi/make.patch index d2c80b8ab3..ffcb156b32 100644 --- a/gnome2-libs/at-spi/make.patch +++ b/gnome2-libs/at-spi/make.patch @@ -1,6 +1,6 @@ diff -Naur at-spi-1.30.1.orig/Makefile.in at-spi-1.30.1/Makefile.in ---- at-spi-1.30.1.orig/Makefile.in 2010-10-06 15:13:10.764999538 -0700 -+++ at-spi-1.30.1/Makefile.in 2010-10-06 15:14:37.888000738 -0700 +--- at-spi-1.30.1.orig/Makefile.in 2010-10-06 16:18:38.192000020 -0700 ++++ at-spi-1.30.1/Makefile.in 2010-10-06 16:18:58.011000022 -0700 @@ -901,11 +901,11 @@ @INTLTOOL_SCHEMAS_RULE@ @@ -12,7 +12,7 @@ diff -Naur at-spi-1.30.1.orig/Makefile.in at-spi-1.30.1/Makefile.in -@GCONF_SCHEMAS_INSTALL_TRUE@ fi +@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \ +@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \ -+@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ ++@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \ +@GCONF_SCHEMAS_INSTALL_TRUE@ done \ +@GCONF_SCHEMAS_INSTALL_TRUE@ fi @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: |