Make a proper manuals directory for translation

diff --git a/configure.in b/configure.in
index 12f93e122aa1023deccb6be92d0285f4e9aa1f2f..4b20da21be12cf135ed424b56e4d32024377e847 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3867,6 +3867,7 @@ AC_CONFIG_FILES([\
        errors/Makefile \
        test-suite/Makefile \
        doc/Makefile \
+       doc/manuals/Makefile \
        helpers/Makefile \
        helpers/basic_auth/Makefile \
        helpers/basic_auth/LDAP/Makefile \

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f3f93fb516a313e460562194e1372967cc9dbfdb..d3649a400f1227758cda149a26b04da6c2b4a455 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,6 +6,8 @@
 #  Uncomment and customize the following to suit your needs:
 #
 
+SUBDIRS = manuals
+
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 DEFAULT_MIME_TABLE      = $(sysconfdir)/mime.conf

diff --git a/doc/manualpo/ar.po b/doc/manuals/ar.po
similarity index 100%
rename from doc/manualpo/ar.po
rename to doc/manuals/ar.po

diff --git a/doc/manuals.pot b/doc/manuals/manuals.pot
similarity index 100%
rename from doc/manuals.pot
rename to doc/manuals/manuals.pot

diff --git a/mksnapshot.sh b/mksnapshot.sh
index b49bfe18e89b6dbfe0d385953af016b0826155eb..ddcd3fdcdaa92a4c38f685728fdedc0cb6a9faaf 100755 (executable)
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -101,7 +101,6 @@ fi
 # Collate Manual Pages and generate HTML versions
 if (groff --help >/dev/null); then
        make -C ${tmpdir}/doc all
-       mkdir -p ${tmpdir}/doc/manuals
        cp ${tmpdir}/doc/*.8 ${tmpdir}/doc/manuals/
         for f in `ls -1 ${tmpdir}/helpers/*/*/*.8` ; do
                cp $f ${tmpdir}/doc/manuals/
@@ -109,7 +108,7 @@ if (groff --help >/dev/null); then
         for f in `ls -1 ${tmpdir}/doc/manuals/*.8` ; do
                cat ${f} | groff -E -Thtml -mandoc >${f}.html
        done
-       sh -c "cd ${tmpdir}/doc/manuals && tar -zcf $PWD/${PACKAGE}-${VERSION}-${date}-manuals.tar.gz *"
+       sh -c "cd ${tmpdir}/doc/manuals && tar -zcf $PWD/${PACKAGE}-${VERSION}-${date}-manuals.tar.gz *.html *.8"
        echo ${PACKAGE}-${VERSION}-${date}-manuals.tar.gz >>${tag}.out
 fi