[smuxi: 120/179] Work around BSD install not having -D
- From: Mirco M. M. Bauer <mmmbauer src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [smuxi: 120/179] Work around BSD install not having -D
- Date: Sat, 4 Nov 2017 05:48:07 +0000 (UTC)
commit 792600bdb9472e57ca17e680b17625324d06ee8a
Author: Carlos MartÃn Nieto <cmn dwim me>
Date: Wed Dec 28 20:19:11 2016 +0100
Work around BSD install not having -D
The `-D` option is a GNU extension, so trying to build smuxi without GNU coreutils
is not going to work.
Since there's no indication from `./configure` that we need GNU install (as the
first thing it does is check for a BSD-compatible install), let's let it build
with the system's own userland.
src/Frontend-GNOME/Makefile.am | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/src/Frontend-GNOME/Makefile.am b/src/Frontend-GNOME/Makefile.am
index 1763f66..31b41bd 100644
--- a/src/Frontend-GNOME/Makefile.am
+++ b/src/Frontend-GNOME/Makefile.am
@@ -2,6 +2,8 @@ TARGET_DIR = $(top_builddir)/bin/$(PROFILE)
EXTRA_DIST = $(WIN_ICON) $(DESKTOP_FILE).in $(man_MANS) $(appdata_in_files)
man_MANS = smuxi-frontend-gnome.1
+mkdir_p = $(install_sh) -d
+
ICON_NAME = smuxi-frontend-gnome
ICON_NAME_PNG = $(ICON_NAME).png
ICON_SVG = $(ICON_NAME).svg
@@ -97,27 +99,38 @@ BINARIES = \
all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES)
$(ICON_SVG):
+ $(mkdir_p) $(dir $@)
$(INSTALL) -m644 $(top_srcdir)/images/icon.svg $@
$(ICON_XPM):
+ $(mkdir_p) $(dir $@)
$(INSTALL) -m644 $(top_srcdir)/images/icon.xpm $@
$(ICON_16):
- $(INSTALL) -D -m644 $(top_srcdir)/images/icon_16x16.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/icon_16x16.png $@
$(ICON_22):
- $(INSTALL) -D -m644 $(top_srcdir)/images/icon_22x22.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/icon_22x22.png $@
$(ICON_24):
- $(INSTALL) -D -m644 $(top_srcdir)/images/icon_24x24.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/icon_24x24.png $@
$(ICON_32):
- $(INSTALL) -D -m644 $(top_srcdir)/images/icon_32x32.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/icon_32x32.png $@
$(ICON_48):
- $(INSTALL) -D -m644 $(top_srcdir)/images/icon_48x48.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/icon_48x48.png $@
$(ICON_128):
- $(INSTALL) -D -m644 $(top_srcdir)/images/icon_128x128.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/icon_128x128.png $@
$(ICON_256):
- $(INSTALL) -D -m644 $(top_srcdir)/images/icon_256x256.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/icon_256x256.png $@
$(top_builddir)/images/256/$(GROUP_CHAT_ICON_NAME).png:
- $(INSTALL) -D -m644 $(top_srcdir)/images/group-chat_256x256.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/group-chat_256x256.png $@
$(top_builddir)/images/256/$(PERSON_CHAT_ICON_NAME).png:
- $(INSTALL) -D -m644 $(top_srcdir)/images/person-chat_256x256.png $@
+ $(mkdir_p) $(dir $@)
+ $(INSTALL) -m644 $(top_srcdir)/images/person-chat_256x256.png $@
FILES = \
../AssemblyVersion.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]