summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-01-25 21:19:59 +0100
committerRichard Levitte <levitte@openssl.org>2016-01-25 21:19:59 +0100
commit9ab6fc5936be62f6fee1c433938eae4c89aa23da (patch)
tree0f0177f9d404741116b0c65c157db32c10410a35 /apps
parent52cdc9970de5f0e884d829d8dfa23c89c51527f9 (diff)
Generate warning text
Now that we're using templates, we should warn people not to edit the resulting file. We do it through util/dofile.pl, which is enhanced with an option to tell what file it was called from. We also change the calls so the template files are on the command line instead of being redirected through standard input. That way, we can display something like this (example taken from include/openssl/opensslconf.h): /* WARNING: do not edit! */ /* Generated by Configure from include/openssl/opensslconf.h.in */ Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/CA.pl.in4
-rw-r--r--apps/Makefile.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/CA.pl.in b/apps/CA.pl.in
index b54df5efa9..52a97d7345 100644
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -1,8 +1,8 @@
#!{- $config{perl} -}
#
# Wrapper around the ca to make it easier to use
-# Edit CA.pl.in not CA.pl!
-
+#
+# {- join("\n# ", @autowarntext) -}
use strict;
use warnings;
diff --git a/apps/Makefile.in b/apps/Makefile.in
index 290dff6ba5..8d2433b5c3 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -140,7 +140,7 @@ progs.h: progs.pl Makefile
$(RM) openssl.o
CA.pl: CA.pl.in
- $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl < CA.pl.in > CA.pl.new
+ $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl -oapps/Makefile CA.pl.in > CA.pl.new
mv CA.pl.new CA.pl