Use DESTDIR variable in install/uninstall make target (#42).

This allows to easily install the browser into a own directory with
`make DESTDIR=/install/dir install`.

Also all internal used directory names are defined without the trailing
slashes.

diff --git a/Makefile b/Makefile
index c814d91..57cf4a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,12 +39,12 @@ man:
        @$(MAKE) $(MFLAGS) -C doc man
 
 install: $(TARGET)
-       install -d $(BINDIR)
-       install -m 755 $(TARGET) $(BINDIR)
+       install -d $(DESTDIR)$(BINDIR)
+       install -m 755 $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
        @$(MAKE) $(MFLAGS) -C doc install
 
 uninstall:
-       $(RM) $(BINDIR)$(TARGET)
+       $(RM) $(DESTDIR)$(BINDIR)/$(TARGET)
        @$(MAKE) $(MFLAGS) -C doc uninstall
 
 clean:

diff --git a/config.mk b/config.mk
index 7bf1139..62d2af7 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -2,9 +2,9 @@
 VERSION = 0.1.8
 
 PROJECT = vimb
-PREFIX  ?= /usr/local/
-BINDIR  ?= $(PREFIX)bin/
-MANDIR  ?= $(PREFIX)share/man/
+PREFIX  ?= /usr/local
+BINDIR  ?= $(PREFIX)/bin
+MANDIR  ?= $(PREFIX)/share/man
 
 #----------------compile options---------------------
 

diff --git a/doc/Makefile b/doc/Makefile
index 2de98c9..e7e57fb 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
 include ../config.mk
 
-MANDIR1 = $(MANDIR)man1/
+MANDIR1 = $(MANDIR)/man1
 MAN1    = $(PROJECT).1
 
 all: man
@@ -14,12 +14,11 @@ man: $(MAN1)
                -e "s/PROJECT/$(PROJECT)/g" < $< > $@
 
 install: man
-       @echo install manual page
-       install -d $(MANDIR1)
-       install -m 644 $(MAN1) $(MANDIR1)$(MAN1)
+       install -d $(DESTDIR)$(MANDIR1)
+       install -m 644 $(MAN1) $(DESTDIR)$(MANDIR1)/$(MAN1)
 
 uninstall:
-       $(RM) $(MANDIR1)$(MAN1)
+       $(RM) $(DESTDIR)$(MANDIR1)/$(MAN1)
 
 clean:
        $(RM) *.1