From 3fb861d10a2bb68b6d4f26e3c73b71f46d1c64e2 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Sat, 24 Oct 2015 00:49:15 +0200 Subject: [PATCH 1/2] Makefile: Define prefix variables in CFLAGS --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index dad0d7d2..f5331ff0 100644 --- a/Makefile +++ b/Makefile @@ -112,6 +112,15 @@ CFLAGS += -DMXQ_VERSION=\"${MXQ_VERSION}\" CFLAGS += -DMXQ_VERSIONFULL=\"${MXQ_VERSIONFULL}\" CFLAGS += -DMXQ_VERSIONDATE=\"${MXQ_VERSIONDATE}\" CFLAGS += -DMXQ_VERSIONEXTRA=\"${MXQ_VERSIONEXTRA}\" +CFLAGS += -DPREFIX=\"${PREFIX}\" +CFLAGS += -DEPREFIX=\"${EPREFIX}\" +CFLAGS += -DSBINDIR=\"${SBINDIR}\" +CFLAGS += -DBINDIR=\"${BINDIR}\" +CFLAGS += -DLIBDIR=\"${LIBDIR}\" +CFLAGS += -DLIBEXECDIR=\"${LIBEXECDIR}\" +CFLAGS += -DDATADIR=\"${DATADIR}\" +CFLAGS += -DMANDIR=\"${MANDIR}\" +CFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\" CFLAGS += $(EXTRA_CFLAGS) ######################################################################## From 6f75345ff537cd45dfc95c64b1ba5bfb4046127c Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Sat, 24 Oct 2015 00:54:34 +0200 Subject: [PATCH 2/2] Makefile: Add new target nonroot to build non-root mxqd be sure to make clean before running nonroot for the first time --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index f5331ff0..716bc3f3 100644 --- a/Makefile +++ b/Makefile @@ -184,6 +184,10 @@ manpages/%: manpages/%.xml all: build +.PHONY: nonroot +nonroot: CFLAGS += -DRUNASNORMALUSER +nonroot: all + ######################################################################## .PHONY: test