summaryrefslogtreecommitdiffstats
path: root/Makefile.org
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.org')
-rw-r--r--Makefile.org14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.org b/Makefile.org
index f2e31a5794..b6d600ed32 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -190,8 +190,7 @@ FDIRS= sha1 rand des aes dsa rsa
# should be performed.
TESTS = alltests
-MAKEFILE= Makefile.ssl
-MAKE= make -f Makefile.ssl
+MAKEFILE= Makefile
MANDIR=$(OPENSSLDIR)/man
MAN1=1
@@ -222,7 +221,7 @@ HEADER= e_os.h
# When we're prepared to use shared libraries in the programs we link here
# we might remove 'clean-shared' from the targets to perform at this stage
-all: Makefile.ssl sub_all openssl.pc
+all: Makefile sub_all openssl.pc
sigs: $(SIGS)
libcrypto.sha1: libcrypto.a
@@ -596,7 +595,7 @@ do_reliantunix-shared:
libs="-l$$i $$libs"; \
done
-openssl.pc: Makefile.ssl
+openssl.pc: Makefile
@ ( echo 'prefix=$(INSTALLTOP)'; \
echo 'exec_prefix=$${prefix}'; \
echo 'libdir=$${exec_prefix}/lib'; \
@@ -609,8 +608,8 @@ openssl.pc: Makefile.ssl
echo 'Libs: -L$${libdir} -lssl -lcrypto $(LIBKRB5) $(EX_LIBS)'; \
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
-Makefile.ssl: Makefile.org
- @echo "Makefile.ssl is older than Makefile.org."
+Makefile: Makefile.org
+ @echo "Makefile is older than Makefile.org."
@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
@false
@@ -640,7 +639,7 @@ makefile.one: files
sh util/do_ms.sh
files:
- $(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
+ $(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
@for i in $(DIRS) ;\
do \
if [ -d "$$i" ]; then \
@@ -650,7 +649,6 @@ files:
done;
links:
- @$(TOP)/util/point.sh Makefile.ssl Makefile
@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
@for i in $(DIRS); do \