Change command used to install help files so that it ignores VCS directories.

git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@208 13b04d17-f746-0410-82c6-800466cd88b0
2012-06-17 23:22:55 +00:00
parent 904ad9edef
commit 69fd6e12c7
28 changed files with 3 additions and 141 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,11 +112,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

@@ -216,9 +211,9 @@ installdll_local: $(srcdir)/Makefile dll/Makefile
 	  && $(MAKE) 'PLUGINDIR=$(local_dir)/.BitchX/plugins'

 installhelp: installdirs
-	cd $(top_srcdir) \
-	  && $(INSTALL_HELP_CMD)
-	(find $(DESTDIR)$(HELPDIR) -type f ! -name '*.bz2' ! -name '*.gz' | \
+	cd $(top_srcdir)/bitchx-docs && \
+		find . -name .svn -prune -o -print | cpio -pdmu -R `id -un`:`id -gn` "$(DESTDIR)$(HELPDIR)"
+	(find "$(DESTDIR)$(HELPDIR)" -type f ! -name '*.bz2' ! -name '*.gz' | \
 		(xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null

 installbin: installirc @INSTALL_EXTRAS@
--- a/bx-conf/Makefile.in
+++ b/bx-conf/Makefile.in
@@ -82,11 +82,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/configure.in
+++ b/configure.in
@@ -1023,7 +1023,6 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then
  INSTALL_WSERV="\$(IRCLIB)/wserv\$(EXEEXT)"
  INSTALL_SCRBX="\$(IRCLIB)/scr-bx\$(EXEEXT)"
  INSTALL_SCRIPT="\$(IRCLIB)/script"
-  INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(DESTDIR)\$(HELPDIR)"
  PLUGINDIR="\$(IRCLIB)/plugins"
  DEFAULT_CTOOLZ_DIR="/PROGRA~1/BitchX"
  DEFAULT_MSGLOGFILE="BitchX.awy"
@@ -1044,7 +1043,6 @@ else
  INSTALL_WSERV="\$(IRCLIB)/wserv\$(EXEEXT)"
  INSTALL_SCRBX="\${bindir}/scr-bx\$(EXEEXT)"
  INSTALL_SCRIPT="\$(IRCLIB)/script"
-  INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(DESTDIR)\$(HELPDIR)"
  PLUGINDIR="\$(IRCLIB)/plugins"
  DEFAULT_CTOOLZ_DIR="~/.BitchX"
  DEFAULT_MSGLOGFILE="BitchX.away"
@@ -1081,7 +1079,6 @@ AC_SUBST(HELPDIR)
 AC_SUBST(INSTALL_WSERV)
 AC_SUBST(INSTALL_SCRBX)
 AC_SUBST(INSTALL_SCRIPT)
-AC_SUBST(INSTALL_HELP_CMD)
 AC_SUBST(PLUGINDIR)
 AC_SUBST(INCLUDES)
 AC_SUBST(GUI_SRCS)
--- a/dll/Makefile.in
+++ b/dll/Makefile.in
@@ -87,11 +87,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/abot/Makefile.in
+++ b/dll/abot/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/acro/Makefile.in
+++ b/dll/acro/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/aim/Makefile.in
+++ b/dll/aim/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/aim/toc/Makefile.in
+++ b/dll/aim/toc/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/amp/Makefile.in
+++ b/dll/amp/Makefile.in
@@ -86,11 +86,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/arcfour/Makefile.in
+++ b/dll/arcfour/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/autocycle/Makefile.in
+++ b/dll/autocycle/Makefile.in
@@ -86,11 +86,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/blowfish/Makefile.in
+++ b/dll/blowfish/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/cavlink/Makefile.in
+++ b/dll/cavlink/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/cdrom/Makefile.in
+++ b/dll/cdrom/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/encrypt/Makefile.in
+++ b/dll/encrypt/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/europa/Makefile.in
+++ b/dll/europa/Makefile.in
@@ -86,11 +86,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/fserv/Makefile.in
+++ b/dll/fserv/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/hint/Makefile.in
+++ b/dll/hint/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/identd/Makefile.in
+++ b/dll/identd/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/nap/Makefile.in
+++ b/dll/nap/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/nicklist/Makefile.in
+++ b/dll/nicklist/Makefile.in
@@ -86,11 +86,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/pkga/Makefile.in
+++ b/dll/pkga/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/possum/Makefile.in
+++ b/dll/possum/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/qbx/Makefile.in
+++ b/dll/qbx/Makefile.in
@@ -82,11 +82,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/qmail/Makefile.in
+++ b/dll/qmail/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/wavplay/Makefile.in
+++ b/dll/wavplay/Makefile.in
@@ -83,11 +83,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/dll/xmms/Makefile.in
+++ b/dll/xmms/Makefile.in
@@ -85,11 +85,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@

--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -88,11 +88,6 @@ IRCPATH = @IRCPATH@
 # Path for TRANSLATION variable.
 TRANSLATION_PATH = @TRANSLATION_PATH@

-# This command will be used to install the BitchX help files. If you don't
-# want to install them, replace with the following:
-# INSTALL_HELP_CMD = @echo The help files have not been installed.
-INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-
 # This is where the optional plugins will be copied to.
 PLUGINDIR = @PLUGINDIR@