diff options
| author | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
| commit | 024555f93f1eea4ad6d995342cf34568ca10d634 (patch) | |
| tree | 471f830efe6d6487fd58e6b04d67d2fb0b7dad32 /redland/rasqal | |
| parent | 3c7aa987dbb717e153ea2f22a194c1e4b1b40ec2 (diff) | |
| parent | 0a094712b5d9e71575bec057efb700d6126d9ba7 (diff) | |
sb118: merged in re/DEV300_next towards DEV300_m76
Diffstat (limited to 'redland/rasqal')
| -rw-r--r-- | redland/rasqal/makefile.mk | 3 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.patch.ooo_build | 22 |
2 files changed, 23 insertions, 2 deletions
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index af0f34ab9431..fc9e93baaa6d 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -55,8 +55,7 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ - $(TARFILE_NAME).patch.win32 \ - + $(TARFILE_NAME).patch.win32 PATCH_FILES=$(OOO_PATCH_FILES) diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build index eb4d24bb9c45..827147995e6f 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.ooo_build +++ b/redland/rasqal/rasqal-0.9.16.patch.ooo_build @@ -32,3 +32,25 @@ fi if test "$echo_libtool_libs" = "yes"; then echo @libdir@/@RASQAL_LIBTOOLLIBS@ +--- misc/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:21.000000000 +0000 ++++ misc/build/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:56.000000000 +0000 +@@ -22,7 +22,7 @@ + + noinst_SCRIPTS = rasqal-src-config + +-SUBDIRS=src utils tests docs data win32 ++SUBDIRS=src tests docs data win32 + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc +--- misc/rasqal-0.9.16/Makefile.in 2010-02-12 08:43:19.000000000 +0000 ++++ misc/build/rasqal-0.9.16/Makefile.in 2010-02-12 08:44:03.000000000 +0000 +@@ -242,7 +242,7 @@ + with_raptor = @with_raptor@ + with_redland = @with_redland@ + noinst_SCRIPTS = rasqal-src-config +-SUBDIRS = src utils tests docs data win32 ++SUBDIRS = src tests docs data win32 + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc + EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ |