Skip to content

Commit

Permalink
fix double / in install paths #122
Browse files Browse the repository at this point in the history
Change install paths from ${DESTDIR}/${PREFIX} to ${DESTDIR}${PREFIX},
this fixes the double / when installing.

The double / is an issue on Windows because a path like //usr is a
network share and not resolved to a filesystem path like on UNIX.
  • Loading branch information
rkitover committed Jul 27, 2015
1 parent b5bea3b commit 958b286
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions Makefile
Expand Up @@ -46,25 +46,25 @@ uninstall:

install: docs
@chmod +x ./install-sh 2>/dev/null || true; \
${MKPATH} ${DESTDIR}/${PREFIX}/bin; \
echo ${INSTALLBIN} vimpager ${DESTDIR}/${PREFIX}/bin/vimpager; \
${INSTALLBIN} vimpager ${DESTDIR}/${PREFIX}/bin/vimpager; \
echo ${INSTALLBIN} vimcat ${DESTDIR}/${PREFIX}/bin/vimcat; \
${INSTALLBIN} vimcat ${DESTDIR}/${PREFIX}/bin/vimcat; \
${MKPATH} ${DESTDIR}${PREFIX}/bin; \
echo ${INSTALLBIN} vimpager ${DESTDIR}${PREFIX}/bin/vimpager; \
${INSTALLBIN} vimpager ${DESTDIR}${PREFIX}/bin/vimpager; \
echo ${INSTALLBIN} vimcat ${DESTDIR}${PREFIX}/bin/vimcat; \
${INSTALLBIN} vimcat ${DESTDIR}${PREFIX}/bin/vimcat; \
if [ -r vimpager.1 -o -r vimcat.1 ]; then \
${MKPATH} ${DESTDIR}/${PREFIX}/share/man/man1; \
${MKPATH} ${DESTDIR}${PREFIX}/share/man/man1; \
fi; \
if [ -r vimpager.1 ]; then \
echo ${INSTALLMAN} vimpager.1 ${DESTDIR}/${PREFIX}/share/man/man1/vimpager.1; \
${INSTALLMAN} vimpager.1 ${DESTDIR}/${PREFIX}/share/man/man1/vimpager.1; \
echo ${INSTALLMAN} vimpager.1 ${DESTDIR}${PREFIX}/share/man/man1/vimpager.1; \
${INSTALLMAN} vimpager.1 ${DESTDIR}${PREFIX}/share/man/man1/vimpager.1; \
fi; \
if [ -r vimcat.1 ]; then \
echo ${INSTALLMAN} vimcat.1 ${DESTDIR}/${PREFIX}/share/man/man1/vimcat.1; \
${INSTALLMAN} vimcat.1 ${DESTDIR}/${PREFIX}/share/man/man1/vimcat.1; \
echo ${INSTALLMAN} vimcat.1 ${DESTDIR}${PREFIX}/share/man/man1/vimcat.1; \
${INSTALLMAN} vimcat.1 ${DESTDIR}${PREFIX}/share/man/man1/vimcat.1; \
fi; \
${MKPATH} ${DESTDIR}/${SYSCONFDIR}; \
echo ${INSTALLCONF} vimpagerrc ${DESTDIR}/${SYSCONFDIR}/vimpagerrc; \
${INSTALLCONF} vimpagerrc ${DESTDIR}/${SYSCONFDIR}/vimpagerrc
${MKPATH} ${DESTDIR}${SYSCONFDIR}; \
echo ${INSTALLCONF} vimpagerrc ${DESTDIR}${SYSCONFDIR}/vimpagerrc; \
${INSTALLCONF} vimpagerrc ${DESTDIR}${SYSCONFDIR}/vimpagerrc

docs: vimpager.1 vimcat.1
@rm -f docs-warn-stamp
Expand Down

0 comments on commit 958b286

Please sign in to comment.