makefiles: support PREFIX and SYSCONFDIR

diff --git a/Makefile b/Makefile
index 8f44771ec1758d7b800c7377b2108fcadd923bc8..9a4a52eab360b893354afa39c9c20584e942e6ef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,15 +56,15 @@ src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
 
 install: all
        echo "INSTALL"
-       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
-       $(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
-       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/include/i3
-       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/share/xsessions
-       $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
-       test -e $(DESTDIR)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
-       $(INSTALL) -m 0644 i3.welcome $(DESTDIR)/etc/i3/welcome
-       $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
-       $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)/usr/include/i3/
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions
+       $(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/
+       test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
+       $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome
+       $(INSTALL) -m 0644 i3.desktop $(DESTDIR)$(PREFIX)/share/xsessions/
+       $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install
 

diff --git a/common.mk b/common.mk
index b1940140b34381cab3a9d34420f974a6235cf963..0334ac61bd7720ec4eb292d71d4b751f8cdbcfbe 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,6 +1,12 @@
 UNAME=$(shell uname)
 DEBUG=1
 INSTALL=install
+PREFIX=/usr
+ifeq ($(PREFIX),/usr)
+SYSCONFDIR=/etc
+else
+SYSCONFDIR=$(PREFIX)/etc
+endif
 GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
 VERSION:=$(shell git describe --tags --abbrev=0)
 

diff --git a/i3-input/Makefile b/i3-input/Makefile
index c8881654381f8519d7990e1761ae953a76904e5a..74f3f8da7be77b40e03ca5e7f58d48b2d0b19efd 100644 (file)
--- a/i3-input/Makefile
+++ b/i3-input/Makefile
@@ -18,8 +18,8 @@ all: ${FILES}
 
 install: all
        echo "INSTALL"
-       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
-       $(INSTALL) -m 0755 i3-input $(DESTDIR)/usr/bin/
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+       $(INSTALL) -m 0755 i3-input $(DESTDIR)$(PREFIX)/bin/
 
 clean:
        rm -f *.o

diff --git a/i3-msg/Makefile b/i3-msg/Makefile
index ec4ba6e63c90842536d211bbf4ae3401420edd87..d75d807c570eab8b38bf787f95501e1c9149070d 100644 (file)
--- a/i3-msg/Makefile
+++ b/i3-msg/Makefile
@@ -20,8 +20,8 @@ all: ${FILES}
 
 install: all
        echo "INSTALL"
-       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
-       $(INSTALL) -m 0755 i3-msg $(DESTDIR)/usr/bin/
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+       $(INSTALL) -m 0755 i3-msg $(DESTDIR)$(PREFIX)/bin/
 
 clean:
        rm -f *.o