From 27df3c8341e4396dab297fc1f230bba014c557b5 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 4 Mar 2026 11:08:46 +0100 Subject: [PATCH] openvpn: refactoring INSTALL_DIR command call during install Move the 'INSTALL_DIR' creation in the make install target to the location where the files are also installed. This prevents directories that are no longer needed from being forgotten during refactoring. Signed-off-by: Florian Eckert --- net/openvpn/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index dd60e700f2..447d42872b 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -92,34 +92,32 @@ endef define Package/openvpn-$(BUILD_VARIANT)/install $(INSTALL_DIR) \ - $(1)/usr/sbin \ - $(1)/usr/share/openvpn \ $(1)/etc/init.d \ $(1)/etc/config \ $(1)/etc/openvpn \ - $(1)/etc/uci-defaults \ $(1)/lib/functions \ - $(1)/lib/netifd/proto \ - $(1)/lib/upgrade/keep.d \ $(1)/usr/libexec \ $(1)/etc/hotplug.d/openvpn + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/sbin/openvpn \ $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/lib/netifd/proto $(INSTALL_BIN) \ files/lib/netifd/proto/openvpn.sh \ $(1)/lib/netifd/proto/ + $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_BIN) \ files/etc/uci-defaults/60_openvpn_migrate.sh \ $(1)/etc/uci-defaults/ + $(INSTALL_DIR) $(1)/usr/share/openvpn $(INSTALL_DATA) \ files/openvpn.options \ $(1)/usr/share/openvpn/openvpn.options - $(INSTALL_BIN) \ files/up.uc files/down.uc files/route-pre-down.uc files/route-up.uc \ files/ipchange.uc \ @@ -127,6 +125,7 @@ define Package/openvpn-$(BUILD_VARIANT)/install files/auth-user-pass-verify.uc files/tls-verify.uc \ $(1)/usr/share/openvpn/ + $(INSTALL_DIR) $(1)/lib/upgrade/keep.d $(INSTALL_DATA) \ files/openvpn.sysupgrade \ $(1)/lib/upgrade/keep.d/openvpn