sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (884101db822afbc5ed4f2fbb632d884a8c8b094c)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (884101db822afbc5ed4f2fbb632d884a8c8b094c)
- Date: Tue, 22 Oct 2019 16:55:34 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
audio-soft/cd-discid/BUILD | 3 --
audio-soft/cd-discid/HISTORY | 5 ++++
audio-soft/cd-discid/INSTALL | 3 --
audio-soft/cd-discid/Makefile | 45
+++++++++++++++++++++++++++---------------
4 files changed, 36 insertions(+), 20 deletions(-)
New commits:
commit 884101db822afbc5ed4f2fbb632d884a8c8b094c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
cd-discid: Use the Makefile directly from grimoire
Without copying.
The install target used to strip the program, so use install-strip now.
commit 1e2464f1b4db13fac8190c2914ec9ee52bd85cae
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
cd-discid: Normalize Makefile
diff --git a/audio-soft/cd-discid/BUILD b/audio-soft/cd-discid/BUILD
index 4276e43..125087d 100755
--- a/audio-soft/cd-discid/BUILD
+++ b/audio-soft/cd-discid/BUILD
@@ -1,2 +1 @@
-cp "$SCRIPT_DIRECTORY"/Makefile . &&
-make
+make -f "$SCRIPT_DIRECTORY"/Makefile
diff --git a/audio-soft/cd-discid/HISTORY b/audio-soft/cd-discid/HISTORY
index 4f38e1c..caeca77 100644
--- a/audio-soft/cd-discid/HISTORY
+++ b/audio-soft/cd-discid/HISTORY
@@ -1,3 +1,8 @@
+2019-10-22 Ismael Luceno <ismael AT iodev.co.uk>
+ * Makefile: normalized
+ * BUILD, INSTALL: Use the Makefile directly from the grimoire, without
+ copying
+
2007-02-03 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, BUILD, INSTALL: bump to 0.9, switch to build api 2
diff --git a/audio-soft/cd-discid/INSTALL b/audio-soft/cd-discid/INSTALL
index cbe8406..dbf92d2 100755
--- a/audio-soft/cd-discid/INSTALL
+++ b/audio-soft/cd-discid/INSTALL
@@ -1,2 +1 @@
-make DESTDIR="$INSTALL_ROOT" install
-
+make -f "$SCRIPT_DIRECTORY"/Makefile DESTDIR="$INSTALL_ROOT" install-strip
diff --git a/audio-soft/cd-discid/Makefile b/audio-soft/cd-discid/Makefile
index 496da48..7b81dbd 100644
--- a/audio-soft/cd-discid/Makefile
+++ b/audio-soft/cd-discid/Makefile
@@ -1,23 +1,36 @@
-INSTALL = /usr/bin/install -c
+INSTALL = install
+install_bin_flags =
+install_bin = $(INSTALL) -m555 $(install_bin_flags)
+install_doc = $(INSTALL) -m444
+install_dir = $(INSTALL) -m755 -d
# Installation directories
DESTDIR =
-prefix = ${DESTDIR}/usr
-exec_prefix = ${prefix}
-mandir = ${prefix}/share/man/man1
-bindir = ${exec_prefix}/bin
-etcdir = ${DESTDIR}/etc
+prefix = /usr
+exec_prefix = $(prefix)
+mandir = $(prefix)/share/man/man1
+bindir = $(exec_prefix)/bin
+etcdir = /etc
-exec=cd-discid
-source=${exec}.c
-man=${exec}.1
+exec = cd-discid
+manpages = $(exec:=.1)
-all: ${source}
- gcc ${CFLAGS} -o ${exec} ${source}
+all: $(exec)
+install: install-bin install-man
-install:
- $(INSTALL) -d -m 755 $(bindir)
- $(INSTALL) -m 755 -o 0 -s ${exec} $(bindir)
- $(INSTALL) -d -m 755 $(mandir)
- $(INSTALL) -m 644 -o 0 ${man} $(mandir)
+$(exec): $(exec).o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o
+install-bin: $(exec)
+ $(install_dir) $(DESTDIR)$(bindir)
+ $(install_bin) $(exec) $(DESTDIR)$(bindir)
+
+install-man: $(manpages)
+ $(install_dir) $(DESTDIR)$(mandir)
+ $(install_doc) $(manpages) $(DESTDIR)$(mandir)
+
+install-strip:
+ $(MAKE) install_bin_flags=-s install
+
+
+.PHONY: all install install-bin install-man install-strip
- [SM-Commit] GIT changes to master grimoire by Ismael Luceno (884101db822afbc5ed4f2fbb632d884a8c8b094c), Ismael Luceno, 10/22/2019
Archive powered by MHonArc 2.6.24.