Pull in patches for msvc & plan9 builds

Plan9/mkfile

@@ -2,37 +2,44 @@ BIN=/$objtype/bin
 CC='cc'
 CFLAGS='-D_BSD_EXTENSION -D_C99_SNPRINTF_EXTENSION'
 
-markdown:
-	ape/psh -c 'cd .. && $CC mktags.c -o mktags && ./mktags > blocktags && make'
+markdown:V:	../markdown
 
-none:V: markdown
+../markdown: ../config.h
+	ape/psh -c 'cd .. && $CC mktags.c -o mktags && ./mktags > blocktags && make'
 
 test: markdown
 	ape/psh -c 'cd ..&& make test'
 
-install: markdown
+install:V: ../markdown
 	cp ../markdown $BIN/markdown
 
-install.progs: install
+install.progs:V: install
 	cp ../makepage $BIN/makepage
 	cp ../mkd2html $BIN/mkd2html
 
-install.libs: install
+install.libs:V: install
 	cp ../mkdio.h /sys/include/ape/mkdio.h
 	cp ../libmarkdown.a /$objtype/lib/ape/libmarkdown.a
 
-install.man: install
+install.man:V: install
 	cp markdown.1 /sys/man/1/markdown
 	cp markdown.2 /sys/man/2/markdown
 	cp markdown.6 /sys/man/6/markdown
 
 installall:V: install.libs install.man install.progs
 
-config:
+uninstall:V:
+	rm -f $BIN/markdown $BIN/makepage $BIN/mkd2html
+	rm -f /sys/include/ape/mkdio.h /$objtype/lib/ape/libmarkdown.a
+	rm -f /sys/man/1/markdown /sys/man/2/markdown /sys/man/6/markdown
+
+../config.h:
 	ape/psh -c 'cd .. && ./configure.sh $CONFIG'
 
-clean:
+config:V: ../config.h
+
+clean:V:
 	ape/psh -c 'cd .. && make clean'
 
-nuke:
+nuke:V:
 	ape/psh -c 'cd .. && make distclean'

cmake/config.h.in

@@ -74,4 +74,6 @@
 
 #define TABSTOP @TABSTOP@
 
+#define DESTRUCTOR
+
 #endif /* _CONFIG_D */

msvc/Makefile

@@ -34,7 +34,7 @@ version.obj: version.c VERSION config.h
 	$(CC) $(CFLAGS) -DBRANCH="" -DVERSION=\"$(VERSION)\" /c version.c
 
 mkdio.h: mkdio.h.in
-	powershell.exe -Command "(gc mkdio.h.in) -replace '@DWORD@', 'unsigned long' | Out-File mkdio.h"
+	powershell.exe -Command "(gc mkdio.h.in) -replace '@DWORD@', 'unsigned long' -replace '@SCALAR_HEADER_INCLUDE@', '' | Out-File mkdio.h"
 
 mkdio.obj: mkdio.h
 
@@ -49,8 +49,8 @@ mktags: mktags.obj
 blocktags: mktags
 	.\mktags.exe > blocktags
 
-mkd2html:  mkd2html.obj $(MKDLIB) mkdio.h gethopt.h gethopt.obj
-	$(CC) $(CFLAGS) $(LFLAGS) mkd2html.obj gethopt.obj $(MKDLIB)
+mkd2html:  mkd2html.obj $(MKDLIB) mkdio.h gethopt.h gethopt.obj notspecial.obj
+	$(CC) $(CFLAGS) $(LFLAGS) mkd2html.obj gethopt.obj notspecial.obj $(MKDLIB)
 
 markdown: main.obj $(COMMON) $(MKDLIB)
 	$(CC) $(CFLAGS) $(LFLAGS) /Femarkdown main.obj $(COMMON) $(MKDLIB)

msvc/config.h.vc

@@ -72,4 +72,6 @@
 #define TABSTOP 8
 #define HAVE_MALLOC_H    0
 
+#define DESTRUCTOR
+
 #endif /* __AC_MARKDOWN_D */