Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build system: rename variables related to manual pages 

Rename MANEXT (resp. LIB_MANEXT) to PROGRAMS_MAN_SECTION (resp.
LIBRARIES_MAN_SECTION).

Also get rid of a useless variable assignment in configure.
master
Sébastien Hinderer 2017-03-27 07:38:40 +02:00
parent 5f161087ef
commit eef958007e
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -614,7 +614,7 @@ install:
toplevel/topdirs.mli "$(INSTALL_LIBDIR)"
$(MAKE) -C tools install
ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
$(MKDIR) "$(INSTALL_MANDIR)/man$(MANEXT)"
$(MKDIR) "$(INSTALL_MANDIR)/man$(PROGRAMS_MAN_SECTION)"
-$(MAKE) -C man install
endif
for i in $(OTHERLIBRARIES); do \

4
config/Makefile.mingw
View File

@ -65,8 +65,8 @@ EXT_OBJ=.$(O)
OUTPUTOBJ=-o
EXT_LIB=.$(A)
EXT_ASM=.$(S)
MANEXT=1
LIB_MANEXT=3
PROGRAMS_MAN_SECTION=1
LIBRARIES_MAN_SECTION=3
HASHBANGSCRIPTS=false
PTHREAD_LINK=
PTHREAD_CAML_LINK=

4
config/Makefile.mingw64
View File

@ -65,8 +65,8 @@ EXT_OBJ=.$(O)
OUTPUTOBJ=-o
EXT_LIB=.$(A)
EXT_ASM=.$(S)
MANEXT=1
LIB_MANEXT=3
PROGRAMS_MAN_SECTION=1
LIBRARIES_MAN_SECTION=3
HASHBANGSCRIPTS=false
PTHREAD_LINK=
PTHREAD_CAML_LINK=

4
config/Makefile.msvc
View File

@ -60,8 +60,8 @@ EXT_OBJ=.$(O)
OUTPUTOBJ=-Fo
EXT_LIB=.$(A)
EXT_ASM=.$(S)
MANEXT=1
LIB_MANEXT=3
PROGRAMS_MAN_SECTION=1
LIBRARIES_MAN_SECTION=3
HASHBANGSCRIPTS=false
PTHREAD_LINK=
PTHREAD_CAML_LINK=

4
config/Makefile.msvc64
View File

@ -60,8 +60,8 @@ EXT_OBJ=.$(O)
OUTPUTOBJ=-Fo
EXT_LIB=.$(A)
EXT_ASM=.$(S)
MANEXT=1
LIB_MANEXT=3
PROGRAMS_MAN_SECTION=1
LIBRARIES_MAN_SECTION=3
HASHBANGSCRIPTS=false
PTHREAD_LINK=
PTHREAD_CAML_LINK=

15
configure vendored
View File

@ -24,8 +24,8 @@ bindir=''
target_bindir=''
libdir=''
mandir=''
manext=1
lib_manext=3
programs_man_section=1
libraries_man_section=3
host_type=unknown
target_type=""
ccoption=''
@ -120,10 +120,9 @@ while : ; do
case "$2" in
*/man[1-9ln])
mandir=`echo $2 | sed -e 's|^\(.*\)/man.$|\1|'`
manext=`echo $2 | sed -e 's/^.*\(.\)$/\1/'`;;
programs_man_section=`echo $2 | sed -e 's/^.*\(.\)$/\1/'`;;
*)
mandir=$2
manext=1;;
mandir=$2;;
esac
shift;;
-libunwinddir|--libunwinddir)
@ -277,8 +276,8 @@ case "$mandir" in
mandir="$prefix/man";;
*) echo "MANDIR=$mandir" >> Makefile;;
esac
echo "MANEXT=$manext" >> Makefile
echo "LIB_MANEXT=$lib_manext" >> Makefile
echo "PROGRAMS_MAN_SECTION=$programs_man_section" >> Makefile
echo "LIBRARIES_MAN_SECTION=$libraries_man_section" >> Makefile
# Determine the system type
@ -2060,7 +2059,7 @@ inf
inf "Directories where OCaml will be installed:"
inf " binaries.................. $bindir"
inf " standard library.......... $libdir"
inf " manual pages.............. $mandir (with extension .$manext)"
inf " manual pages.............. $mandir (with extension .$programs_man_section)"
inf "Configuration for the bytecode compiler:"
inf " C compiler used........... $cc"

17
man/Makefile
View File

@ -15,13 +15,14 @@
include ../config/Makefile
INSTALL_DIR=$(DESTDIR)$(MANDIR)/man$(MANEXT)
INSTALL_DIR=$(DESTDIR)$(MANDIR)/man$(PROGRAMS_MAN_SECTION)
install:
for i in *.m; do cp $$i $(INSTALL_DIR)/`basename $$i .m`.$(MANEXT); done
echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' \
> $(INSTALL_DIR)/ocamlc.opt.$(MANEXT)
echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' \
> $(INSTALL_DIR)/ocamlopt.opt.$(MANEXT)
echo '.so man$(MANEXT)/ocamlcp.$(MANEXT)' \
> $(INSTALL_DIR)/ocamloptp.$(MANEXT)
for i in *.m; do cp \
$$i $(INSTALL_DIR)/`basename $$i .m`.$(PROGRAMS_MAN_SECTION); done
echo '.so man$(PROGRAMS_MAN_SECTION)/ocamlc.$(MANEXT)' \
> $(INSTALL_DIR)/ocamlc.opt.$(PROGRAMS_MAN_SECTION)
echo '.so man$(PROGRAMS_MAN_SECTION)/ocamlopt.$(MANEXT)' \
> $(INSTALL_DIR)/ocamlopt.opt.$(PROGRAMS_MAN_SECTION)
echo '.so man$(PROGRAMS_MAN_SECTION)/ocamlcp.$(MANEXT)' \
> $(INSTALL_DIR)/ocamloptp.$(PROGRAMS_MAN_SECTION)