aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in76
1 files changed, 23 insertions, 53 deletions
diff --git a/Makefile.in b/Makefile.in
index be49761490..30aab6add1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,10 +28,10 @@ SHELL = /bin/sh
ERL_TOP = @ERL_TOP@
# OTP release
-OTP = @OTP@
+OTP = OTP-@OTP_REL@
# erts (Erlang RunTime System) version
-ERTS = @ERTS@
+ERTS = erts-@ERTS_VSN@
# ----------------------------------------------------------------------
@@ -130,20 +130,25 @@ ERLANG_INST_BINDIR= $(ERLANG_INST_LIBDIR)/bin
# during installation. If DESTDIR != "", it cannot be run from this location.
ERLANG_LIBDIR = $(DESTDIR)$(ERLANG_INST_LIBDIR)
-# The directory in which man pages for above executables are put
-ERL_MAN1DIR = $(DESTDIR)$(EXTRA_PREFIX)@mandir@/man1
-ERL_MAN1EXT = 1
-
-# The directory in which Erlang private man pages are put. In order
-# not to clutter up the man namespace these are by default put in the
-# Erlang private directory $(ERLANG_LIBDIR)/man (\@erl_mandir\@ is set
-# to $(erlang_libdir)/man). If you want to install the man pages
-# together with the rest give the argument "--disable-erlang-mandir"
-# when you run configure, which will set \@erl_mandir\@ to \@mandir\@.
-# If you want a special suffix on the manpages set ERL_MANEXT to
-# this suffix, e.g. "erl"
-ERL_MANDIR = $(DESTDIR)$(EXTRA_PREFIX)@erl_mandir@
-ERL_MANEXT =
+# ----------------------------------------------------------------------
+# This functionality has been lost along the way... :(
+# It could perhaps be nice to reintroduce some day; therefore,
+# it is not removed just commented out.
+
+## # The directory in which man pages for above executables are put
+## ERL_MAN1DIR = $(DESTDIR)$(EXTRA_PREFIX)@mandir@/man1
+## ERL_MAN1EXT = 1
+
+## # The directory in which Erlang private man pages are put. In order
+## # not to clutter up the man namespace these are by default put in the
+## # Erlang private directory $(ERLANG_LIBDIR)/man (\@erl_mandir\@ is set
+## # to $(erlang_libdir)/man). If you want to install the man pages
+## # together with the rest give the argument "--disable-erlang-mandir"
+## # when you run configure, which will set \@erl_mandir\@ to \@mandir\@.
+## # If you want a special suffix on the manpages set ERL_MANEXT to
+## # this suffix, e.g. "erl"
+## ERL_MANDIR = $(DESTDIR)$(EXTRA_PREFIX)@erl_mandir@
+## ERL_MANEXT =
# ----------------------------------------------------------------------
@@ -392,7 +397,7 @@ endif
# ---------------------------------------------------------------
# Target only used when building commercial ERTS patches
# ---------------------------------------------------------------
-release_docs docs: html_readmes
+release_docs docs:
ifeq ($(OTP_SMALL_BUILD),true)
cd $(ERL_TOP)/lib && \
ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
@@ -407,41 +412,6 @@ endif
cd $(ERL_TOP)/system/doc && \
ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
-.PHONY: html_readmes clean_html_readmes
-
-HTML_READMES = INSTALL.html INSTALL-WIN32.html INSTALL-CROSS.html
-
-html_readmes: $(HTML_READMES)
-
-clean_html_readmes:
- rm -f $(HTML_READMES)
-
-%.html: %.md
- echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">" > $@
- echo "<html xmlns:fn=\"http://www.w3.org/2005/02/xpath-functions\"><head>" >> $@
- echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">" >> $@
- echo "<style type=\"text/css\">" >> $@
- echo "body {" >> $@
- echo " margin: 4em 4em 4em 4em;" >> $@
- echo " background: white;" >> $@
- echo " font-family: Verdana, Arial, Helvetica, sans-serif;" >> $@
- echo "}" >> $@
- echo "code { font-family: courier;font-weight: normal}" >> $@
- echo "a:link { color: blue; text-decoration: none }" >> $@
- echo "a:active { color: blue; text-decoration: none }" >> $@
- echo "a:visited { color: blue; text-decoration: none }" >> $@
- echo "</style><title>" >> $@
- cat $< | sed -n "s/[ ]*\([^ ].*[^ ]\)[ ]*/\1/p;/[ ]*[^ ][ ]*/q" >> $@
- echo "</title></head><body>" >> $@
-ifneq ($(MD2HTML),)
- $(MD2HTML) $< >> $@
-else
- echo "<pre>" >> $@
- cat $< | sed "s|\&|\&amp\;|g;s|\"|\&quot\;|g;s|<|\&lt\;|g;s|>|\&gt\;|g" >> $@
- echo "</pre>" >> $@
-endif
- echo "</body></html>" >> $@
-
# ----------------------------------------------------------------------
ERLANG_EARS=$(BOOTSTRAP_ROOT)/bootstrap/erts
ELINK=$(BOOTSTRAP_ROOT)/bootstrap/erts/bin/elink
@@ -1027,7 +997,7 @@ $(IBIN_DIR):
# Clean targets
#
-clean: check_recreate_primary_bootstrap clean_html_readmes
+clean: check_recreate_primary_bootstrap
rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
find . -type f -name SKIP -print | xargs $(RM)
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean