From ef1a9bb7d6fd64f05607042fdb266ee974d16e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 13 Jun 2014 16:15:18 +0200
Subject: [PATCH] Move gettext files to 'po/guix'.
* po: Rename to...
* po/guix: ... this.
* po/guix/Makevars (subdir, top_builddir): Adjust accordingly.
* configure.ac: Change 'po/Makefile.in' to 'po/guix/Makefile.in'.
* Makefile.am (SUBDIRS): Change 'po' to 'po/guix'.
---
.gitignore | 32 +++++++++++++++++---------------
Makefile.am | 2 +-
configure.ac | 2 +-
po/{ => guix}/LINGUAS | 0
po/{ => guix}/Makevars | 4 ++--
po/{ => guix}/POTFILES.in | 0
po/{ => guix}/eo.po | 0
po/{ => guix}/pt_BR.po | 0
po/{ => guix}/sr.po | 0
po/{ => guix}/vi.po | 0
10 files changed, 21 insertions(+), 19 deletions(-)
rename po/{ => guix}/LINGUAS (100%)
rename po/{ => guix}/Makevars (93%)
rename po/{ => guix}/POTFILES.in (100%)
rename po/{ => guix}/eo.po (100%)
rename po/{ => guix}/pt_BR.po (100%)
rename po/{ => guix}/sr.po (100%)
rename po/{ => guix}/vi.po (100%)
diff --git a/.gitignore b/.gitignore
index 7cc6751c7ec..755773567c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,21 +22,23 @@ config.cache
/m4/nls.m4
/m4/po.m4
/m4/progtest.m4
-/po/ChangeLog
-/po/Makefile.in.in
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/boldquot.sed
-/po/en@boldquot.header
-/po/en@quot.header
-/po/insert-header.sin
-/po/quot.sed
-/po/remove-potcdate.sin
-/po/stamp-po
-/po/guix.pot
-/po/*.mo
-/po/*.gmo
+/po/guix/ChangeLog
+/po/guix/Makefile.in.in
+/po/guix/Makevars.template
+/po/guix/POTFILES
+/po/guix/Rules-quot
+/po/guix/boldquot.sed
+/po/guix/en@boldquot.*
+/po/guix/en@quot.*
+/po/guix/insert-header.sin
+/po/guix/*.insert-header
+/po/guix/quot.sed
+/po/guix/remove-potcdate.sed
+/po/guix/remove-potcdate.sin
+/po/guix/stamp-po
+/po/guix/guix.pot
+/po/guix/*.mo
+/po/guix/*.gmo
/tests/*.trs
/INSTALL
/m4/*
diff --git a/Makefile.am b/Makefile.am
index 84f8eb1b639..6c63c96345b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,7 +246,7 @@ SUFFIXES = .go
guix_install_go_files = install-nobase_nodist_guilemoduleDATA
$(guix_install_go_files): install-nobase_dist_guilemoduleDATA
-SUBDIRS = po
+SUBDIRS = po/guix
include doc.am
diff --git a/configure.ac b/configure.ac
index d65211779c6..398d8fc705c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@ dnl See `HACKING' for more info.
AM_MISSING_PROG([DOT], [dot])
AC_CONFIG_FILES([Makefile
- po/Makefile.in
+ po/guix/Makefile.in
guix/config.scm])
AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
diff --git a/po/LINGUAS b/po/guix/LINGUAS
similarity index 100%
rename from po/LINGUAS
rename to po/guix/LINGUAS
diff --git a/po/Makevars b/po/guix/Makevars
similarity index 93%
rename from po/Makevars
rename to po/guix/Makevars
index d45ea4b9799..3f85141efbb 100644
--- a/po/Makevars
+++ b/po/guix/Makevars
@@ -2,8 +2,8 @@
DOMAIN = $(PACKAGE)
-subdir = po
-top_builddir = ..
+subdir = po/guix
+top_builddir = ../..
# These options get passed to xgettext. We want to catch standard
# gettext uses, package synopses and descriptions, and SRFI-35 error
diff --git a/po/POTFILES.in b/po/guix/POTFILES.in
similarity index 100%
rename from po/POTFILES.in
rename to po/guix/POTFILES.in
diff --git a/po/eo.po b/po/guix/eo.po
similarity index 100%
rename from po/eo.po
rename to po/guix/eo.po
diff --git a/po/pt_BR.po b/po/guix/pt_BR.po
similarity index 100%
rename from po/pt_BR.po
rename to po/guix/pt_BR.po
diff --git a/po/sr.po b/po/guix/sr.po
similarity index 100%
rename from po/sr.po
rename to po/guix/sr.po
diff --git a/po/vi.po b/po/guix/vi.po
similarity index 100%
rename from po/vi.po
rename to po/guix/vi.po
--
GitLab