Merge branch 'master' of github.com:xroche/httrack

4 files changed, 5 insertions, 5 deletions

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
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
 
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,