commit 27062ef1e4aea372fb056bf7fe00e9a0f9a62be4 parent 6de2d41c0e1f8401de8e171c76fbad7971a825e4 Author: Michael Forney <mforney@mforney.org> Date: Fri, 24 Jan 2014 00:00:43 -0800 Set default paths and programs in Makefile Diffstat:
| M | Makefile | | | 11 | +++++++++++ |
| M | config.mk | | | 18 | ++++++++++-------- |
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile @@ -3,6 +3,17 @@ .PHONY: all all: build +# Defaults for config.mk +PREFIX ?= /usr +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib +INCLUDEDIR ?= $(PREFIX)/include +DATADIR ?= $(PREFIX)/share +PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig + +PKG_CONFIG ?= pkg-config +WAYLAND_SCANNER ?= wayland-scanner + VERSION_MAJOR := 0 VERSION_MINOR := 0 VERSION := $(VERSION_MAJOR).$(VERSION_MINOR) diff --git a/config.mk b/config.mk @@ -1,17 +1,19 @@ # swc: config.mk -PREFIX = /usr/local -BINDIR = $(PREFIX)/bin -LIBDIR = $(PREFIX)/lib -INCLUDEDIR = $(PREFIX)/include -DATADIR = $(PREFIX)/share -PKGCONFIGDIR = $(LIBDIR)/pkgconfig +# The commented out options are defaults + +# PREFIX = /usr/local +# BINDIR = $(PREFIX)/bin +# LIBDIR = $(PREFIX)/lib +# INCLUDEDIR = $(PREFIX)/include +# DATADIR = $(PREFIX)/share +# PKGCONFIGDIR = $(LIBDIR)/pkgconfig CC = gcc CPPFLAGS = -D_GNU_SOURCE # Required for mkostemp CFLAGS = -pipe -PKG_CONFIG ?= pkg-config -WAYLAND_SCANNER ?= wayland-scanner +# PKG_CONFIG = pkg-config +# WAYLAND_SCANNER = wayland-scanner ENABLE_DEBUG = 1