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