summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-09-27 22:01:55 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-09-27 22:01:55 +0000
commita031b12aacf2a586447b39f25a8f0e6ae5944c4d (patch)
tree224cab44744244746ed8579c7fddbb34bddc0c59
parentac5a399de9c2bb3ecd3244f82ee614240e164f5f (diff)
downloadpango-a031b12aacf2a586447b39f25a8f0e6ae5944c4d.tar.gz
(Based on GTK+ patch by J. Ali Harlow in #87774)
Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com> (Based on GTK+ patch by J. Ali Harlow in #87774) * configure.in: Add CROSS_COMPILING conditional. * modules/Makefile.am (install-data-local): Don't generate pango.modules when installing into a DESTDIR or cross-compiling. * examples/Makefile.am (all-local): Don't generate pango.modules when cross-compiling.
-rw-r--r--ChangeLog13
-rw-r--r--ChangeLog.pre-1-1013
-rw-r--r--ChangeLog.pre-1-213
-rw-r--r--ChangeLog.pre-1-413
-rw-r--r--ChangeLog.pre-1-613
-rw-r--r--ChangeLog.pre-1-813
-rw-r--r--configure.in2
-rw-r--r--examples/Makefile.am3
-rw-r--r--modules/Makefile.am24
9 files changed, 104 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6192851d..ffc7582a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com>
+
+ (Based on GTK+ patch by J. Ali Harlow in #87774)
+
+ * configure.in: Add CROSS_COMPILING conditional.
+
+ * modules/Makefile.am (install-data-local): Don't
+ generate pango.modules when installing into a DESTDIR
+ or cross-compiling.
+
+ * examples/Makefile.am (all-local): Don't generate
+ pango.modules when cross-compiling.
+
Fri Sep 27 13:10:25 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/basic/tables-big.i: make charset ordering of
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 6192851d..ffc7582a 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,16 @@
+Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com>
+
+ (Based on GTK+ patch by J. Ali Harlow in #87774)
+
+ * configure.in: Add CROSS_COMPILING conditional.
+
+ * modules/Makefile.am (install-data-local): Don't
+ generate pango.modules when installing into a DESTDIR
+ or cross-compiling.
+
+ * examples/Makefile.am (all-local): Don't generate
+ pango.modules when cross-compiling.
+
Fri Sep 27 13:10:25 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/basic/tables-big.i: make charset ordering of
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 6192851d..ffc7582a 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,16 @@
+Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com>
+
+ (Based on GTK+ patch by J. Ali Harlow in #87774)
+
+ * configure.in: Add CROSS_COMPILING conditional.
+
+ * modules/Makefile.am (install-data-local): Don't
+ generate pango.modules when installing into a DESTDIR
+ or cross-compiling.
+
+ * examples/Makefile.am (all-local): Don't generate
+ pango.modules when cross-compiling.
+
Fri Sep 27 13:10:25 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/basic/tables-big.i: make charset ordering of
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 6192851d..ffc7582a 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,16 @@
+Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com>
+
+ (Based on GTK+ patch by J. Ali Harlow in #87774)
+
+ * configure.in: Add CROSS_COMPILING conditional.
+
+ * modules/Makefile.am (install-data-local): Don't
+ generate pango.modules when installing into a DESTDIR
+ or cross-compiling.
+
+ * examples/Makefile.am (all-local): Don't generate
+ pango.modules when cross-compiling.
+
Fri Sep 27 13:10:25 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/basic/tables-big.i: make charset ordering of
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 6192851d..ffc7582a 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,16 @@
+Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com>
+
+ (Based on GTK+ patch by J. Ali Harlow in #87774)
+
+ * configure.in: Add CROSS_COMPILING conditional.
+
+ * modules/Makefile.am (install-data-local): Don't
+ generate pango.modules when installing into a DESTDIR
+ or cross-compiling.
+
+ * examples/Makefile.am (all-local): Don't generate
+ pango.modules when cross-compiling.
+
Fri Sep 27 13:10:25 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/basic/tables-big.i: make charset ordering of
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 6192851d..ffc7582a 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,16 @@
+Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com>
+
+ (Based on GTK+ patch by J. Ali Harlow in #87774)
+
+ * configure.in: Add CROSS_COMPILING conditional.
+
+ * modules/Makefile.am (install-data-local): Don't
+ generate pango.modules when installing into a DESTDIR
+ or cross-compiling.
+
+ * examples/Makefile.am (all-local): Don't generate
+ pango.modules when cross-compiling.
+
Fri Sep 27 13:10:25 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/basic/tables-big.i: make charset ordering of
diff --git a/configure.in b/configure.in
index 1ea9c779..a080d90f 100644
--- a/configure.in
+++ b/configure.in
@@ -118,6 +118,8 @@ changequote([,])dnl
AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
# define a MAINT-like variable REBUILD which is set if Perl
# is found, so autogenerated sources can be rebuilt
diff --git a/examples/Makefile.am b/examples/Makefile.am
index dc60ea9b..d1834f04 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -49,7 +49,10 @@ pangoft2topgm_LDADD = \
bin_PROGRAMS = $(viewer_programs)
noinst_PROGRAMS = $(ft2_programs)
+if CROSS_COMPILING
+else
all-local: pango.modules
+endif
pango.modules:
if find ../modules -name '*.so' | grep 'so' > /dev/null ; then \
diff --git a/modules/Makefile.am b/modules/Makefile.am
index ea29cb97..d95dc284 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -12,10 +12,28 @@ SUBDIRS = \
EXTRA_DIST = \
module.def
+if CROSS_COMPILING
+RUN_QUERY_IMMODULES_TEST=false
+else
+RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)"
+endif
+
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
- $(top_builddir)/pango/pango-querymodules \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules
+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
+ $(top_builddir)/pango/pango-querymodules \
+ \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
+ $(top_builddir)/pango/pango-querymodules \
+ > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
+ else \
+ echo "***" ; \
+ echo "*** Warning: pango.modules not created" ; \
+ echo "***" ; \
+ echo "*** Generate this file on the target system" ; \
+ echo "*** system using pango-querymodules" ; \
+ echo "***" ; \
+ fi
included-modules:
@for d in $(SUBDIRS) ; do \