From 11c8d6992e5d474b28abcef7a22787f71575c797 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Fri, 4 Dec 2015 23:23:58 +0100
Subject: fix and improve makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 Makefile | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index ef5442f..1df841c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,31 +5,31 @@
 
 
 # The package path prefix, if you want to install to another root, set DESTDIR to that root
-PREFIX ?= /usr
+PREFIX = /usr
 # The library path excluding prefix
-LIB ?= /lib
+LIB = /lib
 # The resource path excluding prefix
-DATA ?= /share
+DATA = /share
 # The library header path excluding prefix
-INCLUDE ?= /include
+INCLUDE = /include
 # The library path including prefix
-LIBDIR ?= $(PREFIX)$(LIB)
+LIBDIR = $(PREFIX)$(LIB)
 # The resource path including prefix
-DATADIR ?= $(PREFIX)$(DATA)
+DATADIR = $(PREFIX)$(DATA)
 # The library header path including prefix
-INCLUDEDIR ?= $(PREFIX)$(INCLUDE)
+INCLUDEDIR = $(PREFIX)$(INCLUDE)
 # The generic documentation path including prefix
-DOCDIR ?= $(DATADIR)/doc
+DOCDIR = $(DATADIR)/doc
 # The info manual documentation path including prefix
-INFODIR ?= $(DATADIR)/info
+INFODIR = $(DATADIR)/info
 # The license base path including prefix
-LICENSEDIR ?= $(DATADIR)/licenses
+LICENSEDIR = $(DATADIR)/licenses
 
 # The name of the package as it should be installed
-PKGNAME ?= libpassphrase
+PKGNAME = libpassphrase
 
 # Options with which to compile the library
-OPTIONS ?= 
+OPTIONS = 
 # PASSPHRASE_ECHO:       Do not hide the passphrase
 # PASSPHRASE_STAR:       Use "*" for each character instead of no echo
 # PASSPHRASE_TEXT:       Use "(empty)" and "(not empty)" instead of no echo
@@ -44,11 +44,11 @@ OPTIONS ?=
 # PASSPHRASE_INVALID:    Prevent duplication of non-initialised memory
 
 # Text to use instead of "*"
-PASSPHRASE_STAR_CHAR      ?= \*
+PASSPHRASE_STAR_CHAR      = *
 # Text to use instead of "(empty)"
-PASSPHRASE_TEXT_EMPTY     ?= (empty)
+PASSPHRASE_TEXT_EMPTY     = (empty)
 # Text to use instead of "(not empty)"
-PASSPHRASE_TEXT_NOT_EMPTY ?= (not empty)
+PASSPHRASE_TEXT_NOT_EMPTY = (not empty)
 
 QUOTED_OPTIONS = PASSPHRASE_STAR_CHAR PASSPHRASE_TEXT_EMPTY PASSPHRASE_TEXT_NOT_EMPTY
 
-- 
cgit v1.2.3-70-g09d2