Patches
| Newsgroups | gmane.comp.gnu.gift.general |
|---|---|
| Message-ID | <[email protected]> |
the following two patches are part of the build system cleanup. the cleanup allows one to build GIFT in a subdirectory elsewhere, instead of in the gift tree itsself. Julia Longtin <[email protected]> _______________________________________________ help-GIFT mailing list [email protected] http://lists.gnu.org/mailman/listinfo/help-gift
01-ChangeLog
(text/plain, 398 B)
--- ../../dev3/gift/ChangeLog 2006-11-18 11:26:47.000000000 -0600
+++ ChangeLog 2006-11-18 11:40:45.000000000 -0600
@@ -3,6 +3,8 @@
* bootstrap-cvs.sh
error out when a step fails.
remove --force from autoconf and aclocal invocations.
+ * configure.in
+ call perl test program with a path, so that we can build gift in a directory other than ${srcdir}
2006-10-10 <[email protected]>
01-configure_in-make_build_in_subdir.patch
(text/plain, 604 B)
--- ../../dev3/gift/configure.in 2006-07-11 15:05:23.000000000 -0500
+++ configure.in 2006-11-18 11:10:17.000000000 -0600
@@ -66,7 +66,7 @@
AC_PATH_PROG(PERL,perl)
-if perl gift-check-perl-config.pl "XML::DOM" "XML::XQL" "XML::XQL::DOM" "Text::Iconv" "HTTP::Request" "XML::Parser";
+if perl ${srcdir}/gift-check-perl-config.pl "XML::DOM" "XML::XQL" "XML::XQL::DOM" "Text::Iconv" "HTTP::Request" "XML::Parser";
then echo "Your perl setup seems to be OK for running the GIFT" ; else
AC_MSG_ERROR([There are some modules missing from your perl configuration. Please see the output above.])
fi
02-ChangeLog
(text/plain, 524 B)
--- ../../dev3/gift/ChangeLog 2006-11-18 11:43:33.000000000 -0600
+++ ChangeLog 2006-11-18 12:02:21.000000000 -0600
@@ -5,6 +5,9 @@
remove --force from autoconf and aclocal invocations.
* configure.in
call perl test program with a path, so that we can build gift in a directory other than ${srcdir}
+ * dtd/Makefile.am
+ make mv invocations use ${top_builddir}, so that we can build gift in a directory other than ${srcdir}
+ replace "../" with appropriate autoconf variables.
2006-10-10 <[email protected]>
02-dtd_Makefile_am-make_build_in_subdir.patch
(text/plain, 864 B)
--- ../../dev2/gift/dtd/Makefile.am 2001-12-11 18:26:21.000000000 +0100
+++ dtd/Makefile.am 2006-10-31 22:22:31.000000000 +0100
@@ -1,14 +1,14 @@
-noinst_DATA= ../libMRML/cc/mrml_const.cc
+noinst_DATA= ${top_builddir}/libMRML/cc/mrml_const.cc
#
# making a new mrml_const.cc if mrml.dtd has been changed
#
-../libMRML/cc/mrml_const.cc: mrml.dtd
- $(PERL) ../scripts/perl/gift-dtd-to-keywords.pl ../dtd/mrml.dtd mrml mrml_const charmer.mrml
- mv mrml_const.h ../libMRML/include
- mv mrml_const.cc ../libMRML/cc
- mv mrml_const.java ../
+${top_builddir}/libMRML/cc/mrml_const.cc: mrml.dtd
+ $(PERL) ${top_builddir}/scripts/perl/gift-dtd-to-keywords.pl ${srcdir}/mrml.dtd mrml mrml_const charmer.mrml
+ mv mrml_const.h ${top_builddir}/libMRML/include
+ mv mrml_const.cc ${top_builddir}/libMRML/cc
+ mv mrml_const.java ${top_builddir}/
EXTRA_DIST=mrml.dtd