From ff879667f348bf4c39acf54610c56b8691e4ff44 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 20 Oct 2011 10:44:33 +0200 Subject: build: fix install locations --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7fa4101..766633e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ -TARGETS = mtu pingu pinguctl client.so +BIN_TARGETS = mtu +SBIN_TARGETS = pingu pinguctl +LUA_TARGETS = client.so +TARGETS = $(BIN_TARGETS) $(SBIN_TARGETS) $(LUA_TARGETS) VERSION = 0.5 prefix = /usr @@ -10,6 +13,7 @@ pingustatedir = $(rundir)/pingu luasharedir = /usr/share/lua/5.1 lualibdir = /usr/lib/lua/5.1 +BINDIR = $(prefix)/bin SBINDIR = $(prefix)/sbin DESTDIR ?= @@ -75,8 +79,10 @@ $(SUBDIRS): $(MAKE) -C $@ install: $(TARGETS) - $(INSTALLDIR) $(DESTDIR)/$(SBINDIR) $(DESTDIR)/$(pingustatedir) - $(INSTALL) $(TARGETS) $(DESTDIR)/$(SBINDIR) + $(INSTALLDIR) $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(SBINDIR) \ + $(DESTDIR)/$(pingustatedir) + $(INSTALL) $(BIN_TARGETS) $(DESTDIR)/$(BINDIR) + $(INSTALL) $(SBIN_TARGETS) $(DESTDIR)/$(SBINDIR) for dir in $(SUBDIRS); do \ $(MAKE) -C $$dir $@ || break; \ done -- cgit v1.2.3