Skip to content

Commit

Permalink
Use DOCDIR in configure (radareorg#7034)
Browse files Browse the repository at this point in the history
This allows users to specify where to install the documentation
  • Loading branch information
mid-kid authored and radare committed Mar 15, 2017
1 parent bb1de1c commit 0187ac8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ install-man-symlink:
ln -fs "${PWD}/man/$$FILE" "${DESTDIR}${MANDIR}/man7/$$FILE" ; done

install-doc:
${INSTALL_DIR} "${DESTDIR}${DATADIR}/doc/radare2"
for FILE in doc/* ; do ${INSTALL_DATA} $$FILE "${DESTDIR}${DATADIR}/doc/radare2" ; done
${INSTALL_DIR} "${DESTDIR}${DOCDIR}"
for FILE in doc/* ; do ${INSTALL_DATA} $$FILE "${DESTDIR}${DOCDIR}" ; done

install-doc-symlink:
${INSTALL_DIR} "${DESTDIR}${DATADIR}/doc/radare2"
${INSTALL_DIR} "${DESTDIR}${DOCDIR}"
cd doc ; for FILE in * ; do \
ln -fs "${PWD}/doc/$$FILE" "${DESTDIR}${DATADIR}/doc/radare2" ; done
ln -fs "${PWD}/doc/$$FILE" "${DESTDIR}${DOCDIR}" ; done

install love: install-doc install-man install-www
cd libr && ${MAKE} install PARENT=1
Expand Down Expand Up @@ -275,7 +275,7 @@ deinstall uninstall:
@echo

purge-doc:
rm -rf "${DESTDIR}${DATADIR}/doc/radare2"
rm -rf "${DESTDIR}${DOCDIR}"
cd man ; for FILE in *.1 ; do rm -f "${DESTDIR}${MANDIR}/man1/$$FILE" ; done
rm -f "${DESTDIR}${MANDIR}/man1/r2.1"

Expand Down
1 change: 1 addition & 0 deletions config-user.mk.acr
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ PREFIX=@PREFIX@
BINDIR=@BINDIR@
LIBDIR=@LIBDIR@
MANDIR=@MANDIR@
DOCDIR=@DOCDIR@
DATADIR=@DATADIR@
INCLUDEDIR=@INCLUDEDIR@

Expand Down
19 changes: 7 additions & 12 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ create_environ() {
: ${DATADIR:="${SPREFIX}/share"}
: ${INFODIR:="${DATADIR}/info"}
: ${MANDIR:="${DATADIR}/man"}
: ${DOCDIR:="${DOCDIR}/man"}
: ${DOCDIR:="${DATADIR}/doc/radare2"}
: ${LOCALSTATEDIR:="${SPREFIX}/var"}
for A in `echo ${PATH} | sed -e 's,:, ,g'` ; do
[ -e "$A"/ginstall ] && : ${INSTALL:="$A"/ginstall} && break
Expand Down Expand Up @@ -143,7 +143,6 @@ Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
--docdir=DIR documentation directory [PREFIX/doc]
--datadir=DIR read-only architecture-independent data [PREFIX/share]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
Expand All @@ -153,15 +152,15 @@ Fine tuning of the installation directories:
--includedir=DIR C header files [PREFIX/include]
--infodir=DIR info documentation [DATADIR/info]
--mandir=DIR man documentation [DATADIR/man]
--docdir=DIR documentation directory [DATADIR/doc/radare2]
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
--target=TARGET configure for building compilers for TARGET [HOST]
EOF2

printf "
Optional Features:
printf "\nOptional Features:
--disable-debugger disable native debugger features
--with-sysmagic force to use system's magic
--disable-loadlibs disable loading plugins
Expand All @@ -175,21 +174,17 @@ Optional Features:
--with-ostype Choose OS type ( gnulinux windows darwin haiku ) (USEROSTYPE=auto)
--without-pic do not build libr as a program independent location
--with-nonpic build the library archives .a
--with-libversion specify different libversion (LIBVERSION=xxx)
"
printf "
Some influential environment variables:
--with-libversion specify different libversion (LIBVERSION=xxx)\n"
printf "\nSome influential environment variables:
CC C compiler command
CFLAGS C compiler flags
CPPFLAGS C preprocessor flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
CPP C preprocessor
"
printf "
Report bugs to: pancake <[email protected]>"
CPP C preprocessor\n"
printf "\nReport bugs to: pancake <[email protected]>"
echo ""
exit 0
}
Expand Down

0 comments on commit 0187ac8

Please sign in to comment.