apps/speed.c: Fix crash when config loading fails

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 68de065f34f56dd19bdb80c994b9b71bebfb32ab..bc1c3be77aa3a9dcc1f416ed47d345b6acaa7d0b 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -179,7 +179,7 @@ SHARED_LDFLAGS=
 GENERAL=        Makefile
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
-TARFILE=        $(NAME).tar
+TARFILE=        ../$(NAME).tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
 
@@ -499,14 +499,15 @@ TABLE: Configure
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
 TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
-                              --owner openssl:0 --group openssl:0 \
+                              --owner 0 --group 0 \
                               --transform 's|^|$(NAME)/|' \
                               -cvf -
 
 $(TARFILE).list:
        find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
               \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
-              \! -name '*test' \! -name '.#*' \! -name '*~' \
+              \( \! -name '*test' -o -name bctest -o -name pod2mantest \) \
+              \! -name '.#*' \! -name '*~' \! -type l \
            | sort > $(TARFILE).list
 
 tar: $(TARFILE).list
@@ -525,8 +526,7 @@ tar-snap: $(TARFILE).list
 dist:   
        $(PERL) Configure dist
        @$(MAKE) SDIRS='$(SDIRS)' clean
-       @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' \
-                TARFILE='$(TARFILE)' NAME='$(NAME)' tar
+       @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
 
 install: all install_docs install_sw