52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
|
From ed1dc4bb5cdc4a53963f3eb01089289e30acc5a3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||
|
|
Date: Wed, 29 Sep 2021 08:28:27 +0200
|
||
|
|
Subject: [PATCH] Makefile: fix install rules to account for $(BUILD)
|
||
|
|
|
||
|
|
Fix missing references to $(BUILD) in the install rules, as well
|
||
|
|
as incorrect shared library symlink name. Otherwise, the 'install'
|
||
|
|
phase fails either being unable to find files:
|
||
|
|
|
||
|
|
make: *** No rule to make target 'miniupnpc.pc', needed by 'install'. Stop.
|
||
|
|
|
||
|
|
or trying to create the symlink in the wrong subdirectory:
|
||
|
|
|
||
|
|
ln: failed to create symbolic link '/tmp/z/usr/lib/build/libminiupnpc.so': No such file or directory
|
||
|
|
---
|
||
|
|
miniupnpc/Makefile | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile
|
||
|
|
index 4563b283..11a17f95 100644
|
||
|
|
--- a/miniupnpc/Makefile
|
||
|
|
+++ b/miniupnpc/Makefile
|
||
|
|
@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
|
||
|
|
|
||
|
|
FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
|
||
|
|
ifeq (, $(findstring amiga, $(OS)))
|
||
|
|
-FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
|
||
|
|
+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
|
||
|
|
endif
|
||
|
|
|
||
|
|
|
||
|
|
@@ -251,15 +251,15 @@ install: updateversion $(FILESTOINSTALL)
|
||
|
|
$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
|
||
|
|
ifeq (, $(findstring amiga, $(OS)))
|
||
|
|
$(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
|
||
|
|
- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
|
||
|
|
+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY))
|
||
|
|
$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
|
||
|
|
- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
|
||
|
|
+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
|
||
|
|
endif
|
||
|
|
$(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
|
||
|
|
ifneq (, $(findstring amiga, $(OS)))
|
||
|
|
- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||
|
|
+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||
|
|
else
|
||
|
|
- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||
|
|
+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||
|
|
endif
|
||
|
|
$(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
|
||
|
|
ifeq (, $(findstring amiga, $(OS)))
|