[mm-common] Rename tags/ to doctags/ to avoid name clash

[Daniel Elstner <daniel src gnome org>]

commit 80b1e4bd59bdb5aed594fc92afb2eb2eb6439186
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Fri Aug 14 03:46:25 2009 +0200

    Rename tags/ to doctags/ to avoid name clash
    
    * doctags/: Rename tags/ subdirectory to avoid clashing with the make
    tags target automatically generated by Automake.  This has not caused
    any problems so far, but there is no reason to ask for it.
    * doctags/mm-common-libstdc++*.pc.in: Change the install location of
    the tag files as well, to minimize confusion.
    * configure.ac (AC_CONFIG_FILES): Adjust output file locations.
    * Makefile.am (doctagsdir): Rename variable from $(doxygen_tagsdir)
    and adjust value to point to the new install location of tag files.

 .gitignore                                         |    4 ++--
 Makefile.am                                        |   16 ++++++++--------
 configure.ac                                       |    4 ++--
 .../mm-common-libstdc++-uninstalled.pc.in          |    2 +-
 {tags => doctags}/mm-common-libstdc++.pc.in        |    2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06e1c3f..43fc048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,6 @@
 /install-sh
 /missing
 /mm-common-*.tar.*
-/tags/libstdc++.tag
-/tags/mm-common-*.pc
+/doctags/libstdc++.tag
+/doctags/mm-common-*.pc
 /util/mm-common-prepare
diff --git a/Makefile.am b/Makefile.am
index a5cbeaa..d135f4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,16 +40,16 @@ dist_doctool_DATA =			\
 	util/doc-postprocess.pl		\
 	util/tagfile-to-devhelp2.xsl
 
-doxygen_tagsdir = $(pkgdatadir)/tags
-dist_doxygen_tags_DATA = tags/libstdc++.tag
+doctagsdir = $(pkgdatadir)/doctags
+dist_doctags_DATA = doctags/libstdc++.tag
 
 shared_pkgconfigdir = $(datadir)/pkgconfig
-nodist_shared_pkgconfig_DATA = tags/mm-common-libstdc++.pc
-noinst_DATA = tags/mm-common-libstdc++-uninstalled.pc
+nodist_shared_pkgconfig_DATA = doctags/mm-common-libstdc++.pc
+noinst_DATA = doctags/mm-common-libstdc++-uninstalled.pc
 
 dist_noinst_SCRIPTS = autogen.sh
 
-MAINTAINERCLEANFILES = $(dist_doxygen_tags_DATA)
+MAINTAINERCLEANFILES = $(dist_doctags_DATA)
 
 # Remote location of the GNU libstdc++ Doxygen tag file.
 libstdcxx_tag_url = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
@@ -58,12 +58,12 @@ libstdcxx_tag_url = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libst
 # not to download a file again if its time stamp has not changed.
 download_curl = $(CURL) --compressed --connect-timeout 300 -g -L -m 3600 -R --retry 5 \
 		$(if $(wildcard $@),-z '$@') -o '$@'
-download_wget = $(WGET) -N -nd -T 300 -t 5 -P '$(@D)'
+download_wget = $(WGET) -N -nd -T 300 -t 5 -P '$(dir $@)'
 
 # If maintainer mode is enabled, always check the remote locations
 # of the tag files for updates when building the default target.
 if MAINTAINER_MODE
-check_updates = $(if $(filter all%,$(or $(MAKECMDGOALS),all)),$(dist_doxygen_tags_DATA))
+check_updates = $(if $(filter all%,$(or $(MAKECMDGOALS),all)),$(dist_doctags_DATA))
 else
 check_updates =
 endif
@@ -74,7 +74,7 @@ endif
 .DELETE_ON_ERROR:
 
 # Download the libstdc++ tag file from the GCC website.
-tags/libstdc++.tag:
+doctags/libstdc++.tag:
 	$(if $(CURL),$(download_curl) '$(libstdcxx_tag_url)',$(if\
 	     $(WGET),$(download_wget) '$(libstdcxx_tag_url)',test -f '$@'))
 
diff --git a/configure.ac b/configure.ac
index e79cea1..d4f6e34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AS_IF([test "x$USE_MAINTAINER_MODE" != xno && test "x$CURL$WGET" = x],
       [AC_MSG_FAILURE([[Either curl or wget is required for building mm-common.]])])
 
 AC_CONFIG_FILES([Makefile
-                 tags/mm-common-libstdc++.pc
-                 tags/mm-common-libstdc++-uninstalled.pc
+                 doctags/mm-common-libstdc++.pc
+                 doctags/mm-common-libstdc++-uninstalled.pc
                  util/mm-common-prepare])
 AC_OUTPUT
diff --git a/tags/mm-common-libstdc++-uninstalled.pc.in b/doctags/mm-common-libstdc++-uninstalled.pc.in
similarity index 79%
rename from tags/mm-common-libstdc++-uninstalled.pc.in
rename to doctags/mm-common-libstdc++-uninstalled.pc.in
index 2119df1..4447af8 100644
--- a/tags/mm-common-libstdc++-uninstalled.pc.in
+++ b/doctags/mm-common-libstdc++-uninstalled.pc.in
@@ -1,4 +1,4 @@
-doxytagfile=${pc_top_builddir}/tags/libstdc++.tag
+doxytagfile=${pc_top_builddir}/doctags/libstdc++.tag
 htmlrefpub=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen
 
 Name: mm-common-libstdc++
diff --git a/tags/mm-common-libstdc++.pc.in b/doctags/mm-common-libstdc++.pc.in
similarity index 85%
rename from tags/mm-common-libstdc++.pc.in
rename to doctags/mm-common-libstdc++.pc.in
index 968a676..8b9bf61 100644
--- a/tags/mm-common-libstdc++.pc.in
+++ b/doctags/mm-common-libstdc++.pc.in
@@ -3,7 +3,7 @@ datarootdir= datarootdir@
 datadir= datadir@
 pkgdatadir=${datadir}/@PACKAGE_TARNAME@
 
-doxytagfile=${pkgdatadir}/tags/libstdc++.tag
+doxytagfile=${pkgdatadir}/doctags/libstdc++.tag
 htmlrefpub=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen
 
 Name: mm-common-libstdc++