changeset 14764:f0292b71104b

[gaim-migrate @ 17521] Fix a couple of issues I ran into while running make distcheck. It still isn't successfully completing but it is getting farther. Right now I'm getting: /usr/bin/xgettext: error while opening "../../po/../gtk/plugins/crazychat/cc_gaim_plugin.c" for reading: No such file or directory ERROR: xgettext failed to generate PO template file. Please consult error message above if there is any. while in the /home/deryni/gaim/clean/gaim-2.0.0beta4/_build/po directory. I think we either need to remove crazy chat from the po files or add it to DIST_SUBDIRS, but I don't have time to test that right now. committer: Tailor Script <tailor@pidgin.im>
author Etan Reisner <pidgin@unreliablesource.net>
date Wed, 18 Oct 2006 15:45:22 +0000
parents 175d85e4c8fa
children 18f4ac7f6de7
files Makefile.am console/plugins/Makefile.am gtk/plugins/perl/Makefile.am
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Wed Oct 18 15:27:38 2006 +0000
+++ b/Makefile.am	Wed Oct 18 15:45:22 2006 +0000
@@ -42,7 +42,7 @@
 	cp gaim.spec $(distdir)
 	rm $(distdir)/config.h
 
-distcheck-hook: libgaim/plugins/perl/common/Gaim.pm
+distcheck-hook: libgaim/plugins/perl/common/Gaim.pm gtk/plugins/perl/common/GtkUI.pm
 #	cp libgaim/plugins/perl/common/Gaim.pm $(distdir)/libgaim/plugins/perl/common
 
 appsdir = $(datadir)/applications
--- a/console/plugins/Makefile.am	Wed Oct 18 15:27:38 2006 +0000
+++ b/console/plugins/Makefile.am	Wed Oct 18 15:45:22 2006 +0000
@@ -28,6 +28,7 @@
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/libgaim \
 	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/console \
 	-I$(top_srcdir)/console/libgnt \
 	$(DEBUG_CFLAGS) \
--- a/gtk/plugins/perl/Makefile.am	Wed Oct 18 15:27:38 2006 +0000
+++ b/gtk/plugins/perl/Makefile.am	Wed Oct 18 15:45:22 2006 +0000
@@ -37,6 +37,11 @@
 	$(common_sources)
 
 common/Makefile: common/Makefile.PL
+	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
+		for f in ${common_sources}; do \
+			${LN_S} -f ../${srcdir}/$$f $$f; \
+		done; \
+	fi
 	@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
 
 common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status