From 8dae03a9fefea29e94a8e97f461260522274164a Mon Sep 17 00:00:00 2001 From: kraxel Date: Mon, 9 Jun 2008 14:56:36 +0000 Subject: - fix build error. - build system updates. - bump version for release. --- mk/Variables.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mk/Variables.mk') diff --git a/mk/Variables.mk b/mk/Variables.mk index 69486f3..99f787c 100644 --- a/mk/Variables.mk +++ b/mk/Variables.mk @@ -6,8 +6,12 @@ DESTDIR = srcdir ?= . prefix ?= /usr/local bindir = $(DESTDIR)$(prefix)/bin -mandir = $(DESTDIR)$(prefix)/share/man -locdir = $(DESTDIR)$(prefix)/share/locale +sbindir = $(DESTDIR)$(prefix)/sbin +libdir = $(DESTDIR)$(prefix)/$(LIB) +shrdir = $(DESTDIR)$(prefix)/share +mandir = $(shrdir)/man +locdir = $(shrdir)/locale +appdir = $(shrdir)/applications # package + version empty := @@ -17,13 +21,16 @@ ifneq ($(wildcard $(srcdir)/VERSION),) else VERSION := 42 endif +RELTAG := v$(subst .,_,$(VERSION)) # programs CC ?= gcc CXX ?= g++ MOC ?= $(if $(QTDIR),$(QTDIR)/bin/moc,moc) + +STRIP ?= -s INSTALL ?= install -INSTALL_BINARY := $(INSTALL) -s +INSTALL_BINARY := $(INSTALL) $(STRIP) INSTALL_SCRIPT := $(INSTALL) INSTALL_DATA := $(INSTALL) -m 644 INSTALL_DIR := $(INSTALL) -d -- cgit