From 0438c9a615142a79aceac05a1f179eda9b639dac Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 21 Dec 2008 01:49:20 +0000 Subject: Fix GConf schema installation. Reported by: Alexander Logvinov git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11830 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/libcanberra/Makefile | 1 + audio/libcanberra/files/patch-Makefile.in | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 8ec7d0c49..d7a67a7d5 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -7,6 +7,7 @@ PORTNAME= libcanberra PORTVERSION= 0.10 +PORTREVISION= 1 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ diff --git a/audio/libcanberra/files/patch-Makefile.in b/audio/libcanberra/files/patch-Makefile.in index d5aa031f9..bd5972c31 100644 --- a/audio/libcanberra/files/patch-Makefile.in +++ b/audio/libcanberra/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2008-12-19 19:06:39.000000000 -0500 -+++ Makefile.in 2008-12-19 19:07:02.000000000 -0500 +--- Makefile.in.orig 2008-12-20 13:42:12.000000000 -0500 ++++ Makefile.in 2008-12-20 20:43:22.000000000 -0500 @@ -271,7 +271,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ dist_doc_DATA = README @@ -9,3 +9,20 @@ MAINTAINERCLEANFILES = README noinst_DATA = README pkgconfigdir = $(prefix)/libdata/pkgconfig +@@ -794,11 +794,11 @@ uninstall-am: uninstall-dist_docDATA uni + + + @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: +-@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@ done \ +-@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)/$$p ; \ ++@GCONF_SCHEMAS_INSTALL_TRUE@ done ; \ ++@GCONF_SCHEMAS_INSTALL_TRUE@ fi + @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: + + README: -- cgit v1.2.3