Fix make symstall with relative paths

This commit is contained in:
pancake 2017-10-18 17:53:00 +02:00
parent 855757a3ad
commit 1926ad859a
9 changed files with 20 additions and 19 deletions

View File

@ -184,7 +184,7 @@ install-man:
install-man-symlink:
mkdir -p "${DESTDIR}${MANDIR}/man1"
mkdir -p "${DESTDIR}${MANDIR}/man7"
cd man && for FILE in *.1 ; do \
for FILE in $(shell cd man && ls *.1) ; do \
ln -fs "${PWD}/man/$$FILE" "${DESTDIR}${MANDIR}/man1/$$FILE" ; done
cd "${DESTDIR}${MANDIR}/man1" && ln -fs radare2.1 r2.1
for FILE in *.7 ; do \
@ -192,14 +192,15 @@ install-man-symlink:
install-doc:
${INSTALL_DIR} "${DESTDIR}${DOCDIR}"
@echo ${DOCDIR}
for FILE in doc/* ; do \
if [ -f $$FILE ]; then ${INSTALL_DATA} $$FILE "${DESTDIR}${DOCDIR}" || true ; fi; \
done
install-doc-symlink:
${INSTALL_DIR} "${DESTDIR}${DOCDIR}"
cd doc ; for FILE in * ; do \
ln -fs "${PWD}/doc/$$FILE" "${DESTDIR}${DOCDIR}" ; done
for FILE in $(shell cd doc ; ls) ; do \
ln -fs "$(PWD)/doc/$$FILE" "${DESTDIR}${DOCDIR}" ; done
install love: install-doc install-man install-www
cd libr && ${MAKE} install PARENT=1
@ -220,7 +221,7 @@ install love: install-doc install-man install-www
cp -f doc/hud "${DESTDIR}${DATADIR}/radare2/${VERSION}/hud/main"
mkdir -p "${DESTDIR}${DATADIR}/radare2/${VERSION}/"
$(SHELL) sys/ldconfig.sh
$(SHELL) ./configure-plugins --rm-static $(DESTDIR)/$(LIBDIR)/radare2/last/
$(SHELL) ./configure-plugins --rm-static $(DESTDIR)$(LIBDIR)/radare2/last/
# Remove make .d files. fixes build when .c files are removed
rmd:
@ -237,14 +238,13 @@ symstall-www:
rm -rf "${DESTDIR}${WWWROOT}"
rm -rf "${DESTDIR}${LIBDIR}/radare2/${VERSION}/www" # old dir
mkdir -p "${DESTDIR}${WWWROOT}"
cd "${DESTDIR}${WWWROOT}" ; \
for FILE in "${PWD}/shlr/www/"* ; do \
ln -fs "$$FILE" "$(DESTDIR)$(WWWROOT)" ; done
for FILE in $(shell cd shlr/www ; ls) ; do \
ln -fs "$(PWD)/shlr/www/$$FILE" "$(DESTDIR)$(WWWROOT)" ; done
install-pkgconfig-symlink:
@${INSTALL_DIR} "${DESTDIR}${LIBDIR}/pkgconfig"
cd pkgcfg ; for FILE in *.pc ; do \
ln -fs "$${PWD}/$$FILE" "${DESTDIR}${LIBDIR}/pkgconfig/$$FILE" ; done
for FILE in $(shell cd pkgcfg ; ls *.pc) ; do \
ln -fs "$(PWD)/pkgcfg/$$FILE" "${DESTDIR}${LIBDIR}/pkgconfig/$$FILE" ; done
symstall-sdb:
for DIR in ${DATADIRS} ; do (\

View File

@ -102,8 +102,8 @@ $(LIBS):
@${MAKE} -C $@
pkgcfg:
@for lib in ${LIBS}; do ( cd $${lib} && ${MAKE} pkgcfg ); done
cd asm && ${MAKE} pkgcfg NAME=libr DEPS="r_`echo ${LIBS}|sed -e 's, , r_,g'`"
@for lib in ${LIBS}; do ${MAKE} -C $${lib} pkgcfg; done
$(MAKE) -C asm pkgcfg NAME=libr DEPS="r_`echo ${LIBS}|sed -e 's, , r_,g'`"
# TODO: Magically generate libr.pc.acr here using LIBS and so :)
install-pkgconfig:

View File

@ -10,7 +10,8 @@ install: ${F_SDB}
CWD=$(shell pwd)
symstall install-symlink: ${F_SDB}
mkdir -p "$(MAGICDIR)"
cd default ; for FILE in * ; do ln -fs "${CWD}/default/$$FILE" \
"$(MAGICDIR)/$$FILE" ; done
for FILE in $(shell cd default && ls) ; do \
ln -fs "${CWD}/default/$$FILE" "$(MAGICDIR)/$$FILE" ; \
done
.PHONY: install symstall

View File

@ -1,2 +1,2 @@
all:
cd ../libr && ${MAKE} pkgcfg
$(MAKE) -C libr pkgcfg

View File

@ -7,5 +7,5 @@ Name: r_anal
Description: radare foundation libraries
Version: @VERSION@
Requires:
Libs: -L${libdir} -lr_anal -lr_util -lr_reg -lr_syscall -lr_search
Libs: -L${libdir} -lr_anal -lr_util -lr_reg -lr_syscall -lr_search -lr_cons -lr_flag
Cflags: -I${includedir}/libr

View File

@ -7,5 +7,5 @@ Name: r_asm
Description: radare foundation libraries
Version: @VERSION@
Requires:
Libs: -L${libdir} -lr_asm -lr_syscall -lr_lang -lr_util -lr_parse -lr_flag -lr_cons -lr_reg -lr_anal
Libs: -L${libdir} -lr_asm -lr_syscall -lr_lang -lr_util -lr_parse -lr_flag -lr_cons -lr_reg
Cflags: -I${includedir}/libr

View File

@ -7,5 +7,5 @@ Name: r_debug
Description: radare foundation libraries
Version: @VERSION@
Requires:
Libs: -L${libdir} -lr_debug -lr_reg -lr_anal -lr_bp -lr_io -lr_parse -lr_cons -lr_syscall -lr_hash -lr_flag -lr_util -lr_socket
Libs: -L${libdir} -lr_debug -lr_reg -lr_anal -lr_bp -lr_io -lr_parse -lr_cons -lr_syscall -lr_hash -lr_flag -lr_util -lr_egg -lr_socket
Cflags: -I${includedir}/libr

View File

@ -3,7 +3,7 @@ exec_prefix=${prefix}
libdir=@LIBDIR@
includedir=${prefix}/include
Name: r_flags
Name: r_flag
Description: radare foundation libraries
Version: @VERSION@
Requires:

View File

@ -7,5 +7,5 @@ Name: r_parse
Description: radare foundation libraries
Version: @VERSION@
Requires:
Libs: -L${libdir} -lr_parse -lr_flag -lr_util -lr_anal -lr_syscall -lr_reg -lr_cons
Libs: -L${libdir} -lr_parse -lr_flag -lr_util -lr_syscall -lr_reg -lr_cons
Cflags: -I${includedir}/libr