Fix my broken merge of Jacob's patch to make inability to build python

* python/Makefile.am: Fix my broken merge of Jacob's patch to make inability to
	build python modules non-fatal.

diff --git a/ChangeLog b/ChangeLog
index 9115356..132c17f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-11 nalin
+       * python/Makefile.am: Fix my broken merge of Jacob's patch to make
+       inability to build python modules non-fatal.
+
 2002-09-11 nalin
        * src/vte.c: Skip lookups for padding information if we're pretty sure
        we're using a monospaced font.

diff --git a/Makefile.am b/Makefile.am
index 53d7f99..e305aaa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ archive:
        cvs -d $$root export -r $(CVSTAG) $$repo ; \
        cd $$tmpdir/$$repo ; \
        ./autogen.sh ; \
-       make all distcheck ; \
+       make distcheck ; \
        cp $(PACKAGE)-$(VERSION).tar.gz $$dir/ ; \
        rm -fr $$tmpdir
 

diff --git a/python/Makefile.am b/python/Makefile.am
index 9eb9fd0..e5fb2cb 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -5,7 +5,6 @@ EXTRA_PROGRAMS = vtemodule.so
 if BUILD_PYTHON_BINDINGS
 pythonsiteexecdir = $(pyexecdir)/gtk-2.0
 pythonsiteexec_PROGRAMS = @PYTHONMODULES@
-endif
 
 INCLUDES = @VTE_CFLAGS@ @X_CFLAGS@ @PYTHON_INCLUDES@ @PYGTK_CFLAGS@
 
@@ -17,3 +16,5 @@ LDADD = $(top_builddir)/src/libvte.la @LIBS@ @PYGTK_LIBS@ @VTE_LIBS@ @X_LIBS@
 
 vte.c: vte.defs vte.override
        pygtk-codegen-2.0 -p py$(PACKAGE) -o vte.override --register @PYGTK_DATADIR@/pygtk/2.0/defs/gtk-types.defs --register @PYGTK_DATADIR@/pygtk/2.0/defs/gdk-types.defs --register @PYGTK_DATADIR@/pygtk/2.0/defs/pango-types.defs $< > $@
+
+endif