From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 29 Mar 2011 15:07:21 +0000 (+0100)
Subject: Exclude po-docs directory completely if po4a not available.
X-Git-Tag: 1.9.15~11
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=58f7a5a4ac8cce77dfaded1c29f3ad382b4cc9a8;p=libguestfs.git

Exclude po-docs directory completely if po4a not available.

Lift the if HAVE_PO4A ... endif completely out of the po-docs
subdirectory, and just exclude the whole subdirectory if the po4a
program is not available.
---

diff --git a/Makefile.am b/Makefile.am
index d6b4077..96c4d35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-2011 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -74,7 +74,9 @@ SUBDIRS += fuse
 endif
 
 # po-docs must come after tools, inspector.
+if HAVE_PO4A
 SUBDIRS += po-docs
+endif
 
 EXTRA_DIST = \
 	$(generator_built) \
diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am
index c0a916e..2827770 100644
--- a/po-docs/Makefile.am
+++ b/po-docs/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs translations of man pages and POD files
-# Copyright (C) 2010 Red Hat Inc.
+# Copyright (C) 2010-2011 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,13 +48,7 @@ PODFILES = \
 	../fuse/guestmount.pod \
 	$(wildcard ../tools/virt-*.pl)
 
-if HAVE_PO4A
 update-po: libguestfs-docs.pot
-else
-update-po:
-endif
-
-if HAVE_PO4A
 
 # Note: po4a leaves empty '=encoding' lines in POD files.  Also it
 # includes a large warning message which ends up in the output.  We
@@ -84,5 +78,3 @@ po4a.conf: $(PODFILES)
 	  echo >> $@-t; \
 	done;
 	mv $@-t $@
-
-endif
diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
index 24eb24e..c60626e 100644
--- a/po-docs/ja/Makefile.am
+++ b/po-docs/ja/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs translations of man pages and POD files
-# Copyright (C) 2010 Red Hat Inc.
+# Copyright (C) 2010-2011 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -41,8 +41,6 @@ EXTRA_DIST = \
 	libguestfs-test-tool.pod \
 	$(wildcard virt-*.pl)
 
-if HAVE_PO4A
-
 all-local: $(MANPAGES)
 
 guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-structs.pod
@@ -76,12 +74,6 @@ virt-%.1: virt-%.pl
 	  --man $@ \
 	  $<
 
-else
-
-all-local:
-
-endif
-
 # XXX Can automake do this properly?
 install-data-hook:
 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(LINGUA)/man1