As autopoint copies po/Makefile.in.in we have to patch it so that it has our modifica...
authorChristophe Mutricy <xtophe@videolan.org>
Tue, 29 Jul 2008 22:22:21 +0000 (23:22 +0100)
committerChristophe Mutricy <xtophe@videolan.org>
Wed, 30 Jul 2008 00:03:21 +0000 (01:03 +0100)
bootstrap
po/makefile-qt4.patch [new file with mode: 0644]

index 66834c2..ea59f16 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -112,6 +112,9 @@ rm -f po/Makevars.template ABOUT-NLS
 echo > ABOUT-NLS
 mv -f INSTALL.git INSTALL
 
+# Patch po/Makefile.in.in but it's not a drama if it fails
+patch -p1 < po/makefile-qt4.patch || true
+
 ##
 ##  files which need to be regenerated
 ##
diff --git a/po/makefile-qt4.patch b/po/makefile-qt4.patch
new file mode 100644 (file)
index 0000000..e4ab32a
--- /dev/null
@@ -0,0 +1,22 @@
+commit 8e13f257224e02c91c3b40db99ba5cf9ef52f542
+Author: Christophe Mutricy <xtophe@videolan.org>
+Date:   Sun Jul 27 00:10:51 2008 +0100
+
+    Hack to take care of qt strings with ampersand
+    
+    We will need to reapply this diff when we upgrade Makefile.in.in from a
+    newer gettext
+
+diff --git a/po/Makefile.in.in b/po/Makefile.in.in
+index fecf500..13256d8 100644
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
+@@ -166,6 +166,8 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+             --msgid-bugs-address="$$msgid_bugs_address" \
+           ;; \
+       esac
++      sed 's/&amp;/\&/' $(DOMAIN).po > $(DOMAIN).po1  && \
++      mv $(DOMAIN).po1 $(DOMAIN).po;
+       test ! -f $(DOMAIN).po || { \
+         if test -f $(srcdir)/$(DOMAIN).pot; then \
+           sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \