From 4474146b52234f1c4ffb2d6c4d27790ba084560b Mon Sep 17 00:00:00 2001
From: Xavier Roche <roche@httrack.com>
Date: Fri, 20 Mar 2015 14:08:24 +0100
Subject: Changed .gitmodules submodule pull URL to https, but keeping the push
 URL (.git/modules/src/coucal/config) to ssh (closes #64)

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 4608a5f..5971ad5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/coucal"]
 	path = src/coucal
-	url = git@github.com:xroche/coucal.git
+	url = https://github.com/xroche/coucal.git
-- 
cgit v1.2.3


From 6e2167c1a128f2d9c1e25c4b2e8187f064006d72 Mon Sep 17 00:00:00 2001
From: Xavier Roche <roche@httrack.com>
Date: Fri, 20 Mar 2015 14:19:43 +0100
Subject: Fixed duplicate declaration of MD5CTX (rahrah) (closes  #63)

---
 src/md5.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/md5.h b/src/md5.h
index 1a31afb..39dc40f 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -17,7 +17,7 @@ typedef unsigned long uint32;
 #error undefined: SIZEOF_LONG
 #endif
 
-typedef struct MD5Context {
+struct MD5Context {
   union {
     unsigned char ui8[64];
     uint32 ui32[16];
@@ -25,7 +25,7 @@ typedef struct MD5Context {
   uint32 buf[4];
   uint32 bits[2];
   int doByteReverse;
-} MD5CTX;
+};
 
 void MD5Init(struct MD5Context *context, int brokenEndian);
 void MD5Update(struct MD5Context *context, unsigned char const *buf,
-- 
cgit v1.2.3


From 6316a0bbba489053da99f516d3b99ca37a967b4b Mon Sep 17 00:00:00 2001
From: Xavier Roche <roche@httrack.com>
Date: Fri, 20 Mar 2015 15:22:21 +0100
Subject: Fixed broken symlink with changed --docdir (rahrah) (closes #65)

---
 html/Makefile.am | 2 +-
 html/Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/Makefile.am b/html/Makefile.am
index e517643..aa6a741 100755
--- a/html/Makefile.am
+++ b/html/Makefile.am
@@ -39,6 +39,6 @@ EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
 install-data-hook:
 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
 		( cd $(DESTDIR)$(prefix)/share/httrack \
-			&& $(LN_S) ../doc/httrack html \
+			&& $(LN_S) $(htmldir) html \
 		) \
 	fi
diff --git a/html/Makefile.in b/html/Makefile.in
index 658ef80..5a64095 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -774,7 +774,7 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 install-data-hook:
 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
 		( cd $(DESTDIR)$(prefix)/share/httrack \
-			&& $(LN_S) ../doc/httrack html \
+			&& $(LN_S) $(htmldir) html \
 		) \
 	fi
 
-- 
cgit v1.2.3