+++ Makefile @@ -186,13 +186,13 @@ 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 @@ -275,7 +275,7 @@ @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" +++ config-user.mk.acr @@ -8,6 +8,7 @@ BINDIR=@BINDIR@ LIBDIR=@LIBDIR@ MANDIR=@MANDIR@ +DOCDIR=@DOCDIR@ DATADIR=@DATADIR@ INCLUDEDIR=@INCLUDEDIR@ +++ configure @@ -102,7 +102,7 @@ : ${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 @@ -143,7 +143,6 @@ --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] @@ -153,6 +152,7 @@ --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] @@ -160,8 +160,7 @@ --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 @@ -175,10 +174,8 @@ --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 @@ -186,10 +183,8 @@ nonstandard directory CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor -" -printf " -Report bugs to: pancake " + CPP C preprocessor\n" +printf "\nReport bugs to: pancake " echo "" exit 0 }