[Gaim-commits] SF.net SVN: gaim: [17521] trunk

[<de...@us...>]

Revision: 17521
          http://svn.sourceforge.net/gaim/?rev=17521&view=rev
Author:   deryni9
Date:     2006-10-18 08:45:22 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/console/plugins/Makefile.am
    trunk/gtk/plugins/perl/Makefile.am

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-10-18 15:27:38 UTC (rev 17520)
+++ trunk/Makefile.am	2006-10-18 15:45:22 UTC (rev 17521)
@@ -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

Modified: trunk/console/plugins/Makefile.am
===================================================================
--- trunk/console/plugins/Makefile.am	2006-10-18 15:27:38 UTC (rev 17520)
+++ trunk/console/plugins/Makefile.am	2006-10-18 15:45:22 UTC (rev 17521)
@@ -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) \

Modified: trunk/gtk/plugins/perl/Makefile.am
===================================================================
--- trunk/gtk/plugins/perl/Makefile.am	2006-10-18 15:27:38 UTC (rev 17520)
+++ trunk/gtk/plugins/perl/Makefile.am	2006-10-18 15:45:22 UTC (rev 17521)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.