From cab52ae6a6493d985a91fa5908c79f8b3959d7f0 Mon Sep 17 00:00:00 2001
From: crs <cschoeneman@gmail.com>
Date: Sun, 1 Aug 2004 16:31:47 +0000
Subject: [PATCH] Updated packagers to handle new documentation.

---
 Makefile.am                 |  2 +-
 dist/nullsoft/installer.mak | 13 ++-----------
 dist/nullsoft/synergy.nsi   | 23 ++++++++++++++---------
 dist/rpm/synergy.spec.in    | 19 +++++++++++++++----
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7b922468..6ef89d99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,7 +90,7 @@ dist-pkg: all
 	cp $(PKG_DOC_FILES) $(PKGTOPDIR)/@PACKAGE@-@VERSION@/doc
 	(cd $(PKGTOPDIR)/@PACKAGE@-@VERSION@; \
 		chmod 644 *; \
-		chmod 755 $(PKG_PROG_FILES); \
+		chmod 755 doc $(PKG_PROG_FILES); \
 		strip $(PKG_PROG_FILES) )
 	type=`uname -s -m | tr '[A-Z] ' '[a-z].'`; \
 	(cd $(PKGTOPDIR); tar cf - @PACKAGE@-@VERSION@ | \
diff --git a/dist/nullsoft/installer.mak b/dist/nullsoft/installer.mak
index 30d4d205..8ee184a0 100755
--- a/dist/nullsoft/installer.mak
+++ b/dist/nullsoft/installer.mak
@@ -3,17 +3,8 @@ DEPTH=..\..
 
 NSIS="D:\Program Files\NSIS\makensis"
 
-DOCS =			\
-	AUTHORS		\
-	BUGS		\
-	COPYING		\
-	ChangeLog	\
-	FAQ			\
-	HISTORY		\
-	INSTALL		\
-	NEWS		\
-	README		\
-	TODO		\
+DOCS =						\
+	ChangeLog				\
 	$(NULL)
 
 default: dosifydocs installer
diff --git a/dist/nullsoft/synergy.nsi b/dist/nullsoft/synergy.nsi
index 8ee33656..07b07cc2 100644
--- a/dist/nullsoft/synergy.nsi
+++ b/dist/nullsoft/synergy.nsi
@@ -59,16 +59,21 @@ Section "Synergy (required)"
   File "${DEPTH}\build\synergyc.exe"
   File "${DEPTH}\build\synergys.exe"
   File "${DEPTH}\build\*.dll"
-  File AUTHORS.txt
-  File BUGS.txt
-  File COPYING.txt
   File ChangeLog.txt
-  File FAQ.txt
-  File HISTORY.txt
-  File INSTALL.txt
-  File NEWS.txt
-  File README.txt
-  File TODO.txt
+  File doc\authors.html
+  File doc\autostart.html
+  File doc\compiling.html
+  File doc\configuration.html
+  File doc\developer.html
+  File doc\faq.html
+  File doc\history.html
+  File doc\index.html
+  File doc\license.html
+  File doc\news.html
+  File doc\running.html
+  File doc\security.html
+  File doc\tips.html
+  File doc\todo.html
 
   ; Write the installation path into the registry
   WriteRegStr HKLM SOFTWARE\Synergy "Install_Dir" "$INSTDIR"
diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in
index 073f2f68..a4b368ba 100644
--- a/dist/rpm/synergy.spec.in
+++ b/dist/rpm/synergy.spec.in
@@ -36,13 +36,24 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/synergyc
 /usr/bin/synergys
 %doc AUTHORS
-%doc BUGS
 %doc COPYING
 %doc ChangeLog
-%doc FAQ
-%doc HISTORY
 %doc INSTALL
 %doc NEWS
 %doc README
-%doc TODO
+%doc doc/authors.html
+%doc doc/autostart.html
+%doc doc/compiling.html
+%doc doc/configuration.html
+%doc doc/developer.html
+%doc doc/faq.html
+%doc doc/history.html
+%doc doc/index.html
+%doc doc/license.html
+%doc doc/news.html
+%doc doc/running.html
+%doc doc/security.html
+%doc doc/tips.html
+%doc doc/todo.html
+%doc doc/synergy.css
 %doc examples/synergy.conf