e_os.h does not belong with the exported headers.  Do not put it there
and make all files the depend on it include it without prefixing it
with openssl/.

This means that all Makefiles will have $(TOP) as one of the include
directories.

Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 049fa04..6a7af9d 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -197,7 +197,6 @@
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
-LNHEADER=       e_os.h
 HEADER=         e_os.h
 
 # When we're prepared to use shared libraries in the programs we link here
@@ -375,7 +374,7 @@
 links:
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
-	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) $(LNHEADER)
+	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
 	@for i in $(DIRS); do \
 	if [ -d "$$i" ]; then \
 		(cd $$i && echo "making links in $$i..." && \
@@ -467,6 +466,14 @@
 	gzip --best >../$(TARFILE).gz; \
 	ls -l ../$(TARFILE).gz
 
+tar-snap:
+	@$(TAR) $(TARFLAGS) -cvf - \
+		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' | sort` |\
+	tardy --user_number=0  --user_name=openssl \
+	      --group_number=0 --group_name=openssl \
+	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
+	ls -l ../$(TARFILE)
+
 dist:   
 	$(PERL) Configure dist
 	@$(MAKE) dist_pem_h