aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-04-06 03:32:03 +0200
committerMattias Andrée <maandree@kth.se>2021-04-06 03:32:03 +0200
commitc15d84e7716f31584535143b93acef565d8f3730 (patch)
treeee0b8c95aafe97fa4d8304ae59541e028780aeb5
parentFix filtering based on block status (diff)
downloadcontacts-c15d84e7716f31584535143b93acef565d8f3730.tar.gz
contacts-c15d84e7716f31584535143b93acef565d8f3730.tar.bz2
contacts-c15d84e7716f31584535143b93acef565d8f3730.tar.xz
Swap install rule in multicall-symlinks.mk amd singlecall.mk so it is as intended
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--multicall-symlinks.mk9
-rw-r--r--singlecall.mk9
2 files changed, 9 insertions, 9 deletions
diff --git a/multicall-symlinks.mk b/multicall-symlinks.mk
index 314cecd..2cd918c 100644
--- a/multicall-symlinks.mk
+++ b/multicall-symlinks.mk
@@ -1,5 +1,10 @@
all: contacts
-install: $(BIN)
+install: contacts
+ mkdir -p -- "$(DESTDIR)$(PREFIX)/lib"
mkdir -p -- "$(DESTDIR)$(PREFIX)/bin"
- cp -- $(BIN) "$(DESTDIR)$(PREFIX)/bin/"
+ cp -- contacts "$(DESTDIR)$(PREFIX)/lib/"
+ cd -- "$(DESTDIR)$(PREFIX)/bin/" &&\
+ for f in $(BIN); do\
+ ln -s -- ../lib/contacts "$$f" || exit 1;\
+ done
diff --git a/singlecall.mk b/singlecall.mk
index 1e429f4..1068186 100644
--- a/singlecall.mk
+++ b/singlecall.mk
@@ -1,10 +1,5 @@
all: $(BIN)
-install: contacts
- mkdir -p -- "$(DESTDIR)$(PREFIX)/lib"
+install: $(BIN)
mkdir -p -- "$(DESTDIR)$(PREFIX)/bin"
- cp -- contacts "$(DESTDIR)$(PREFIX)/lib/"
- cd -- "$(DESTDIR)$(PREFIX)/bin/" &&\
- for f in $(BIN); do\
- ln -s -- ../lib/contacts "$$f" || exit 1;\
- done
+ cp -- $(BIN) "$(DESTDIR)$(PREFIX)/bin/"