From c482c9d751c3f078d8b22aef034dcf03217145c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gimenez?= <gimenez@pps.jussieu.fr>
Date: Mon, 1 Dec 2014 14:35:12 +0100
Subject: [PATCH 03/11] Use proper Makefile syntax
---
Makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index b30577d..14d8fbd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ PROJECT_ARCHIVE=$(PROJECT_NAME)-$(PROJECT_VERSION)
DESTDIR ?=
PREFIX ?= /usr
-BINDIR ?= ${PREFIX}/bin
-DATADIR ?= ${PREFIX}/share
+BINDIR ?= $(PREFIX)/bin
+DATADIR ?= $(PREFIX)/share
default: all
@@ -21,15 +21,15 @@ byte native byte-debug native-profile:
install:
install -Dp --mode=0755 laby \
- "${DESTDIR}${BINDIR}/laby"
- install -d "${DESTDIR}${DATADIR}/laby/"
- cp -pr data/* "${DESTDIR}${DATADIR}/laby/"
+ "$(DESTDIR)$(BINDIR)/laby"
+ install -d "$(DESTDIR)$(DATADIR)/laby/"
+ cp -pr data/* "$(DESTDIR)$(DATADIR)/laby/"
install -Dp --mode=0644 data/tiles/ant-e.svg \
- "${DESTDIR}${DATADIR}/icons/hicolor/scalable/apps/laby.svg"
+ "$(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/laby.svg"
desktop-file-install packaging/laby.desktop \
- --dir="${DESTDIR}${DATADIR}/applications"
+ --dir="$(DESTDIR)$(DATADIR)/applications"
install -Dp --mode=0644 packaging/laby.appdata.xml \
- "${DESTDIR}${DATADIR}/appdata/laby.appdata.xml"
+ "$(DESTDIR)$(DATADIR)/appdata/laby.appdata.xml"
dist:
@mkdir _dist
--
2.9.4