summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-10-20 12:35:03 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-10-20 12:35:03 (GMT)
commitf18d76b3ab225958feb3a8dd6a2416fc3c6e2463 (patch)
treef422b4cfe6b385fbe46090dcb0d73cac49c77ba3
parent1a0a120b75c28b515cacb021d48d78c18a18b19b (diff)
parenta0eff71b3e315b7e63a6ca29f34e3544d44ba828 (diff)
downloadDoxygen-f18d76b3ab225958feb3a8dd6a2416fc3c6e2463.zip
Doxygen-f18d76b3ab225958feb3a8dd6a2416fc3c6e2463.tar.gz
Doxygen-f18d76b3ab225958feb3a8dd6a2416fc3c6e2463.tar.bz2
Merge pull request #46 from albert-github/feature/bug_647517
bug_647517 - make install prepends a slash to the installation path
-rw-r--r--Makefile.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index 287a06a..fff10db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,21 +81,21 @@ DATE=$(shell date "+%B %Y")
MAN1DIR = man/man1
install: doxywizard_install doxysearch_install
- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
- $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
+ $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)$(INSTALL)/bin
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1
- $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
+ $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxygen.1
rm doxygen.1
install_docs:
- $(INSTTOOL) -d $(DESTDIR)/$(DOCDIR)
+ $(INSTTOOL) -d $(DESTDIR)$(DOCDIR)
$(MAKE) -C examples
$(MAKE) -C doc
$(MAKE) -C latex
- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
- cp -r examples $(DESTDIR)/$(DOCDIR)
- cp -r html $(DESTDIR)/$(DOCDIR)
+ $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)$(DOCDIR)
+ cp -r examples $(DESTDIR)$(DOCDIR)
+ cp -r html $(DESTDIR)$(DOCDIR)
docs: FORCE
cd examples ; $(MAKE)