transmission bittorrent client.
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
From f82b0563a72e33800f5918ead68c41bcda1fd4c1 Mon Sep 17 00:00:00 2001
|
||||
From: heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 1 Oct 2021 00:00:27 +1000
|
||||
Subject: [PATCH] miniupnpc/CMakeLists.txt: fix install for headers
|
||||
|
||||
---
|
||||
miniupnpc/CMakeLists.txt | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/miniupnpc/CMakeLists.txt b/miniupnpc/CMakeLists.txt
|
||||
index 0553eeb3..6b0904c0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -221,16 +221,16 @@ endif ()
|
||||
|
||||
if (NOT UPNPC_NO_INSTALL)
|
||||
install (FILES
|
||||
- miniupnpc.h
|
||||
- miniwget.h
|
||||
- upnpcommands.h
|
||||
- igd_desc_parse.h
|
||||
- upnpreplyparse.h
|
||||
- upnperrors.h
|
||||
- upnpdev.h
|
||||
- miniupnpctypes.h
|
||||
- portlistingparse.h
|
||||
- miniupnpc_declspec.h
|
||||
+ include/miniupnpc.h
|
||||
+ include/miniwget.h
|
||||
+ include/upnpcommands.h
|
||||
+ include/igd_desc_parse.h
|
||||
+ include/upnpreplyparse.h
|
||||
+ include/upnperrors.h
|
||||
+ include/upnpdev.h
|
||||
+ include/miniupnpctypes.h
|
||||
+ include/portlistingparse.h
|
||||
+ include/miniupnpc_declspec.h
|
||||
DESTINATION include/miniupnpc
|
||||
)
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
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/Makefile
|
||||
+++ b/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)))
|
||||
Reference in New Issue
Block a user